From f4f7d26d36b96a24ce1c0deb40d7218213477b32 Mon Sep 17 00:00:00 2001 From: Stiftung Development Date: Mon, 15 Sep 2025 23:02:24 +0200 Subject: [PATCH] fix: Update CI/CD deployment to use active compose.yml file - Fix deployment script to copy docker-compose.prod.yml to compose.yml (not docker-compose.yml) - Update all docker-compose commands to use -f compose.yml explicitly - Rename legacy deploy-synology/docker-compose.yml to .old - This should fix the deployment issue where VPS wasn't getting updated --- .github/workflows/ci-cd.yml | 16 ++++++++-------- ...docker-compose.yml => docker-compose.yml.old} | 0 2 files changed, 8 insertions(+), 8 deletions(-) rename deploy-synology/{docker-compose.yml => docker-compose.yml.old} (100%) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index c6ed23b..54f34ca 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -198,30 +198,30 @@ jobs: # Pull latest changes using Personal Access Token git pull https://$DEPLOY_TOKEN@github.com/remmerinio/stiftung-management-system.git main - # Copy production docker compose file - cp deploy-production/docker-compose.prod.yml docker-compose.yml + # Copy production docker compose file to the active compose.yml + cp deploy-production/docker-compose.prod.yml compose.yml # Login to GitHub Container Registry echo $GITHUB_TOKEN | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin # Pull latest images - docker-compose pull + docker-compose -f compose.yml pull # Stop containers - docker-compose down + docker-compose -f compose.yml down # Start containers with latest images - docker-compose up -d + docker-compose -f compose.yml up -d # Wait for containers to be ready echo "Waiting for containers to start..." sleep 30 # Run migrations - docker-compose exec -T web python manage.py migrate + docker-compose -f compose.yml exec -T web python manage.py migrate # Collect static files - docker-compose exec -T web python manage.py collectstatic --noinput + docker-compose -f compose.yml exec -T web python manage.py collectstatic --noinput # Show container status - docker-compose ps + docker-compose -f compose.yml ps diff --git a/deploy-synology/docker-compose.yml b/deploy-synology/docker-compose.yml.old similarity index 100% rename from deploy-synology/docker-compose.yml rename to deploy-synology/docker-compose.yml.old