From 0ac5e1e5a2f053a98fda79fa163ba716437573d0 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 30 Jan 2025 19:05:43 -0500 Subject: [PATCH 1/2] Adding step for detecting modified services in Compose file. --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 4678e4be..40d6500a 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -286,6 +286,18 @@ jobs: - name: Generate .env file for deployment run: | vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env + - name: Detect modified services + id: detect-modified-services + run: | + git diff --name-only HEAD^ HEAD | grep docker-compose.yml > /dev/null + if [ $? -eq 0 ]; then + modified_services=$(git diff HEAD^ HEAD -- docker-compose.yml | grep -E '^\+[[:space:]]+[a-zA-Z0-9_-]+:' | sed -E 's/^\+[[:space:]]+([a-zA-Z0-9_-]+):.*/\1/') + echo "Modified services: $modified_services" + echo "modified_services=$modified_services" >> $GITHUB_OUTPUT + else + echo "No changes in docker-compose.yml" + echo "modified_services=" >> $GITHUB_OUTPUT + fi - name: Docker Compose Deployment continue-on-error: true uses: keatonLiu/docker-compose-remote-action@v1.2 From 6df7040101c015e3234801680034139075c6b2e2 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 30 Jan 2025 19:07:49 -0500 Subject: [PATCH 2/2] Adding step for detecting modified services in Compose file. --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 40d6500a..b9739b1e 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -299,6 +299,7 @@ jobs: echo "modified_services=" >> $GITHUB_OUTPUT fi - name: Docker Compose Deployment + if: ${{ steps.detect-modified-services.outputs.modified_services != '' }} continue-on-error: true uses: keatonLiu/docker-compose-remote-action@v1.2 with: