From 0d2b6f6067f2400504f2838dbb2f9defb9c4a5c9 Mon Sep 17 00:00:00 2001 From: "azykov@mail.ru" Date: Wed, 1 Jul 2026 11:57:40 +0300 Subject: [PATCH] fix for docker-compose image and container_name --- .gitea/workflows/deploy.yml | 8 +++++--- docker-compose.yml | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 8d4b535..1712d26 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -80,7 +80,7 @@ jobs: run: | echo "${{ secrets.REGISTRY_PASSWORD }}" | \ docker login ${{ env.REGISTRY }} -u ${{ secrets.REGISTRY_USER }} --password-stdin - + mkdir -p "/app-cache/${{ gitea.repository }}" cd "/app-cache/${{ gitea.repository }}" if [ ! -d .git ]; then @@ -90,9 +90,11 @@ jobs: git checkout -f FETCH_HEAD git reset --hard FETCH_HEAD git clean -fdx - printf 'REGISTRY=%s\nIMAGE_PREFIX=%s\n' \ + printf 'REGISTRY=%s\nIMAGE_PREFIX=%s\nIMAGE_TAG=%s\nSERVICE_NAME=%s\n' \ '${{ env.REGISTRY }}' \ - '${{ needs.build-app.outputs.IMAGE_PREFIX }}' > .env + '${{ needs.build-app.outputs.IMAGE_PREFIX }}' \ + '${{ gitea.sha }}' \ + "$(basename '${{ needs.build-app.outputs.IMAGE_PREFIX }}')" > .env /data/tools/docker-compose pull /data/tools/docker-compose up -d --remove-orphans docker image prune -f diff --git a/docker-compose.yml b/docker-compose.yml index a422608..590312a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: server: - image: ${CI_REGISTRY_IMAGE:-claudemcp}/app:${CI_COMMIT_SHA:-latest} - container_name: ${CI_REGISTRY_IMAGE:-claudemcp} + image: ${REGISTRY}/${IMAGE_PREFIX}/app:latest + container_name: ${SERVICE_NAME} restart: unless-stopped ports: - "${APP_PORT:-3000}:3000"