From 1aa529ab2300ed12bff1f8667676b4deb4be2eb3 Mon Sep 17 00:00:00 2001 From: 3252a8 <3252a8@proton.me> Date: Wed, 22 Apr 2026 15:19:54 +0300 Subject: [PATCH] Remove GitHub Actions and stale GHCR defaults --- .github/workflows/dev-docker-build.yml | 59 -------------------------- .github/workflows/docker-publish.yml | 56 ------------------------ README.md | 10 +++-- docker-compose-remote-server.yml | 2 +- docker-compose.yml | 1 - 5 files changed, 7 insertions(+), 121 deletions(-) delete mode 100644 .github/workflows/dev-docker-build.yml delete mode 100644 .github/workflows/docker-publish.yml diff --git a/.github/workflows/dev-docker-build.yml b/.github/workflows/dev-docker-build.yml deleted file mode 100644 index 479ac78..0000000 --- a/.github/workflows/dev-docker-build.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Build and Push Dev GHCR Image - -on: - push: - branches: - - dev - pull_request: - branches: - - dev - -env: - GHCR_IMAGE: ghcr.io/3252a8/remnawave-tg-shop - -jobs: - build: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v5 - with: - images: | - ${{ env.GHCR_IMAGE }} - tags: | - type=ref,event=branch - type=ref,event=pr - type=sha,prefix={{branch}}- - flavor: | - latest=false - - - name: Build and push Docker image - uses: docker/build-push-action@v5 - with: - context: . - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - - - name: Image digest - run: echo ${{ steps.meta.outputs.digest }} diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml deleted file mode 100644 index 447440b..0000000 --- a/.github/workflows/docker-publish.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: Build and Publish GHCR Docker Image - -on: - push: - branches: - - main - tags: - - 'v*.*.*' - paths-ignore: - - 'README.md' - -env: - GHCR_IMAGE: ghcr.io/3252a8/remnawave-tg-shop - -jobs: - build-and-push: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - 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: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v5 - with: - images: | - ${{ env.GHCR_IMAGE }} - tags: | - type=raw,value=latest - type=semver,pattern={{version}} - - - name: Build and push multi-arch Docker image - uses: docker/build-push-action@v5 - with: - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/README.md b/README.md index efd4ad4..c952878 100644 --- a/README.md +++ b/README.md @@ -325,13 +325,15 @@ cd /opt/remnawave/nginx && docker compose down && docker compose up -d && docker ## 🐳 Docker -Файлы `Dockerfile` и `docker-compose.yml` уже настроены для локальной сборки и запуска проекта. Если нужен готовый образ из GHCR, используйте `docker-compose-remote-server.yml` или переключите `docker-compose.yml` на строку `image:` вместо `build: .`. +Файлы `Dockerfile` и `docker-compose.yml` уже настроены для локальной сборки и запуска проекта. -Образ публикуется в GitHub Container Registry по пути `ghcr.io/3252a8/remnawave-tg-shop`. GitHub Actions выкладывают теги `latest` и `0.1.0`: `latest` обновляется из `main`, а `0.1.0` появляется при сборке тега `v0.1.0`. +Если нужен запуск из готового образа, используйте `docker-compose-remote-server.yml` как шаблон и укажите свой `image:` вместо локальной сборки. -Чтобы закрепить версию на сервере, можно запустить: +Этот репозиторий больше не публикует образы автоматически через GitHub Actions. В GHCR сохранён только тег `3.0.0`; `latest` и `0.1.0` больше не используются. + +Чтобы использовать сохранённый образ, можно запустить: ```bash -IMAGE_TAG=0.1.0 docker compose -f docker-compose-remote-server.yml up -d +IMAGE_TAG=3.0.0 docker compose -f docker-compose-remote-server.yml up -d ``` ## 📁 Структура проекта diff --git a/docker-compose-remote-server.yml b/docker-compose-remote-server.yml index d025c36..fe3eb13 100644 --- a/docker-compose-remote-server.yml +++ b/docker-compose-remote-server.yml @@ -1,6 +1,6 @@ services: remnawave-tg-shop: - image: ghcr.io/3252a8/remnawave-tg-shop:${IMAGE_TAG:-latest} + image: ghcr.io/3252a8/remnawave-tg-shop:${IMAGE_TAG:-3.0.0} container_name: remnawave-tg-shop hostname: remnawave-tg-shop env_file: diff --git a/docker-compose.yml b/docker-compose.yml index b341376..1db9c6f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,5 @@ services: remnawave-tg-shop: -# image: ghcr.io/3252a8/remnawave-tg-shop:${IMAGE_TAG:-latest} build: . container_name: remnawave-tg-shop hostname: remnawave-tg-shop