Tweaks for Bitmagnet.

Merged by Trez.One

.gitea/workflows/pr-cloudflare-docker-deploy.yml

@@ -180,17 +180,32 @@ jobs:
           gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}'
           notification_title: 'GITEA: Cloudflare Setup @ Rinoa'
           notification_message: 'Cloudflare DNS setup completed successfully.'
-  regenerate-readme:
+  regenerate-readme-modified-services:
-    name: Update README
+    name: Update README & Generate List of Modified Services
     runs-on: ubuntu-latest
     needs: [cloudflare-dns-setup]
     outputs:
       pr-pushed: ${{ steps.commit-readme.outputs.pushed }}
+      modified_services: ${{ steps.compare-services.outputs.modified_services }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install yq
         uses: dcarbone/install-yq-action@v1
+      - name: Fetch main branch for comparison
+        run: |
+          git fetch origin main:main
+      - name: Compare services using yq
+        continue-on-error: true
+        id: compare-services
+        run: |
+          current_services=$(yq '.services | to_entries' docker-compose.yml)
+          git show main:docker-compose.yml > main_compose.yml
+          main_services=$(yq '.services | to_entries' main_compose.yml)
+          modified_services_file=$(comm -13 <(echo "$main_services") <(echo "$current_services") > changes_compose.yml)
+          modified_services=${egrep '^  [a-z]' changes.yml | sed -e 's|^  ||g' -e 's|:||g' | sed ':a;N;$!ba;s/\n/ /g'}
+          echo "Modified services: $modified_services"
+          echo "modified_services=$modified_services" >> $GITHUB_OUTPUT
       - name: Generate service list
         run: |
           yq '.services | to_entries | map({"service": .key, "image": .value.image})' docker-compose.yml > services.yml
@@ -286,25 +301,13 @@ 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
-        if: ${{ steps.detect-modified-services.outputs.modified_services != '' }}
+        if: ${{ steps.regenerate-readme-modified-services.outputs.modified_services != '' }}
         continue-on-error: true
         uses: keatonLiu/docker-compose-remote-action@v1.2
         with:
           docker_compose_file: docker-compose.yml
-          docker_args: -d --remove-orphans --pull missing  --parallel -1
+          docker_args: -d --remove-orphans --pull missing --parallel -1 ${{ steps.regenerate-readme-modified-services.outputs.modified_services }}
           ssh_user: gitea-deploy
           ssh_host: 192.168.1.254
           ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }}