diff --git a/.gitea/workflows/build-image.yml b/.gitea/workflows/build-image.yml index aa07cb74..ce05bbb0 100644 --- a/.gitea/workflows/build-image.yml +++ b/.gitea/workflows/build-image.yml @@ -1237,7 +1237,18 @@ jobs: echo " Tag: ${IMAGE_TAG}" echo " Host: ${DEPLOYMENT_HOST}" echo " Stack: ${STACK_PATH}" - + + echo "📋 Deploying docker-compose configuration files..." + scp -i ~/.ssh/production \ + -o StrictHostKeyChecking=no \ + -o UserKnownHostsFile=/dev/null \ + docker-compose.base.yml docker-compose.production.yml \ + deploy@${DEPLOYMENT_HOST}:${STACK_PATH}/ || { + echo "❌ Failed to deploy docker-compose files" + exit 1 + } + echo "✅ Docker Compose files deployed successfully" + ssh -i ~/.ssh/production \ -o StrictHostKeyChecking=no \ -o UserKnownHostsFile=/dev/null \ @@ -1257,19 +1268,13 @@ jobs: exit 1 } - # Always copy latest docker-compose files from repo to ensure configuration updates are deployed - echo "📋 Syncing docker-compose files from repository..." - cp /workspace/repo/docker-compose.base.yml . || { - echo "❌ Failed to copy docker-compose.base.yml" + # Ensure docker-compose files exist (rsync deployment handles this) + if [ ! -f docker-compose.base.yml ] || [ ! -f docker-compose.production.yml ]; then + echo "❌ Docker Compose files not found in ${STACK_PATH}" + echo " Expected files are deployed via rsync in deployment scripts" exit 1 - } - - cp /workspace/repo/docker-compose.production.yml . || { - echo "❌ Failed to copy docker-compose.production.yml" - exit 1 - } - - echo "✅ Docker Compose files synced from repository" + fi + echo "✅ Docker Compose files present in deployment directory" echo "📝 Updating docker-compose.production.yml with new image tag..." sed -i "s|image:.*/${IMAGE_NAME}:.*|image: ${FULL_IMAGE}|g" docker-compose.production.yml