From 59110a83a87775a063fad93143d68293a53bc297 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 6 Oct 2025 09:40:44 -0400
Subject: [PATCH] ...

---
 .gitea/workflows/compose-services-readme.yml | 31 ++++----------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/.gitea/workflows/compose-services-readme.yml b/.gitea/workflows/compose-services-readme.yml
index 468f864..5f532fb 100644
--- a/.gitea/workflows/compose-services-readme.yml
+++ b/.gitea/workflows/compose-services-readme.yml
@@ -51,35 +51,16 @@ jobs:
 
     - name: Generate combined service list
       run: |
-        echo "[]" > temp_services.json
+        echo "[]" > combined_services.json
 
-        # Load .env into environment
-        if [ -f .env ]; then
-          export $(grep -v '^#' .env | xargs)
-        fi
-
-        # Read compose files list
-        IFS=$'\n' read -rd '' -a COMPOSE_FILES <<< "${{ steps.find-compose-files.outputs.compose_files }}"
-
-        echo "Processing combined Compose files:"
-        for f in "${COMPOSE_FILES[@]}"; do
-          echo "  $f"
-
-          # Use yq to parse service name + image, expanding anchors
-          yq eval-all '
-            select(fileIndex == 0) * select(fileIndex > 0) |
-            .services | to_entries | map({
-              service: .key,
-              image: (.value.image // "")
-            })' "${COMPOSE_FILES[@]}" \
+        echo "${{ steps.find-compose-files.outputs.compose_files }}" | while IFS= read -r f; do
+          [ -z "$f" ] && continue
+          echo "Processing $f"
+          yq -o=json eval '.services | to_entries | map({"service": .key, "image": .value.image})' "$f" \
             >> temp_services.json
         done
 
-        # Merge all arrays and deduplicate
-        jq -s 'add | unique_by(.service)' temp_services.json > services.json
-
-        echo "Generated services.json:"
-        cat services.json
+        jq -s add temp_services.json | jq 'unique_by(.service)' > services.json
 
     - name: Generate Markdown Table
       uses: gazab/create-markdown-table@6686233d7008e8d8b9d4bbdbfd1fb1ae510019f0 # v1.0.7