docker-compose.yml update and github workflows update

This commit is contained in:
machka
2025-05-20 19:06:44 +00:00
parent 85abf1d401
commit 31f8752ef6
2 changed files with 18 additions and 13 deletions
+9 -4
View File
@@ -1,4 +1,4 @@
name: Build and Publish Docker Image name: Build and Publish multi-arch Docker Image
on: on:
push: push:
@@ -10,7 +10,6 @@ on:
jobs: jobs:
build-and-push: build-and-push:
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:
contents: read contents: read
packages: write packages: write
@@ -26,12 +25,18 @@ jobs:
username: ${{ github.actor }} username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Set up QEMU (для эмуляции arm64 на x86)
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 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 uses: docker/build-push-action@v5
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64
push: true push: true
tags: ghcr.io/${{ github.repository }}:latest tags: |
ghcr.io/${{ github.repository }}:latest
ghcr.io/${{ github.repository }}:${{ github.ref_name }}
+9 -9
View File
@@ -6,10 +6,10 @@ services:
hostname: remnawave-tg-shop hostname: remnawave-tg-shop
env_file: env_file:
- .env - .env
networks: # networks:
- remnawave-network # - remnawave-network
volumes: # volumes:
- ./locales:/app/locales # - ./locales:/app/locales
restart: unless-stopped restart: unless-stopped
postgres: postgres:
@@ -19,13 +19,13 @@ services:
- .env - .env
volumes: volumes:
- remnawave-tg-shop-db-data:/var/lib/postgresql/data - remnawave-tg-shop-db-data:/var/lib/postgresql/data
networks: # networks:
- remnawave-network # - remnawave-network
restart: unless-stopped restart: unless-stopped
networks: # networks:
remnawave-network: # remnawave-network:
external: true # external: true
volumes: volumes:
remnawave-tg-shop-db-data: remnawave-tg-shop-db-data: