From 31f8752ef6da96cacc59bd46eeba9ace4f27a34c Mon Sep 17 00:00:00 2001
From: machka <machkadev@gmail.com>
Date: Tue, 20 May 2025 19:06:44 +0000
Subject: [PATCH] docker-compose.yml update and github workflows update

---
 .github/workflows/docker-publish.yml | 13 +++++++++----
 docker-compose.yml                   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 780cc10..262398d 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -1,4 +1,4 @@
-name: Build and Publish Docker Image
+name: Build and Publish multi-arch Docker Image
 
 on:
   push:
@@ -10,7 +10,6 @@ on:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-
     permissions:
       contents: read
       packages: write
@@ -26,12 +25,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up QEMU (для эмуляции arm64 на x86)
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build and push Docker image
+      - name: Build and push multi-arch Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
-          tags: ghcr.io/${{ github.repository }}:latest
+          tags: |
+            ghcr.io/${{ github.repository }}:latest
+            ghcr.io/${{ github.repository }}:${{ github.ref_name }}
diff --git a/docker-compose.yml b/docker-compose.yml
index 5d0d39c..d626644 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,10 +6,10 @@ services:
     hostname: remnawave-tg-shop
     env_file:
       - .env
-    networks:
-      - remnawave-network
-    volumes:
-      - ./locales:/app/locales
+#    networks:
+#      - remnawave-network
+#    volumes:
+#      - ./locales:/app/locales
     restart: unless-stopped
 
   postgres:
@@ -19,13 +19,13 @@ services:
       - .env
     volumes:
       - remnawave-tg-shop-db-data:/var/lib/postgresql/data
-    networks:
-      - remnawave-network
+#    networks:
+#      - remnawave-network
     restart: unless-stopped
 
-networks:
-  remnawave-network:
-    external: true
+# networks:
+#   remnawave-network:
+#     external: true
 
 volumes:
   remnawave-tg-shop-db-data: