Merge pull request #3118 from nextcloud/fix-compose

update update-yaml.sh follow-up
nextcloud · Aug 9, 2023 · 7fb3e4c · 7fb3e4c
2 parents d898508 + e267fdd
commit 7fb3e4c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 35 deletions.
diff --git a/manual-install/latest.yml b/manual-install/latest.yml
@@ -1,21 +1,21 @@
 services:
   nextcloud-aio-apache:
     depends_on:
-      - nextcloud-aio-onlyoffice:
-          condition: service_started
-          required: false
-      - nextcloud-aio-collabora:
-          condition: service_started
-          required: false
-      - nextcloud-aio-talk:
-          condition: service_started
-          required: false
-      - nextcloud-aio-nextcloud:
-          condition: service_started
-          required: false
-      - nextcloud-aio-notify-push:
-          condition: service_started
-          required: false
+      nextcloud-aio-onlyoffice:
+        condition: service_started
+        required: false
+      nextcloud-aio-collabora:
+        condition: service_started
+        required: false
+      nextcloud-aio-talk:
+        condition: service_started
+        required: false
+      nextcloud-aio-nextcloud:
+        condition: service_started
+        required: false
+      nextcloud-aio-notify-push:
+        condition: service_started
+        required: false
     image: nextcloud/aio-apache:latest
     ports:
       - ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/tcp
@@ -69,24 +69,24 @@ services:
 
   nextcloud-aio-nextcloud:
     depends_on:
-      - nextcloud-aio-database:
-          condition: service_started
-          required: false
-      - nextcloud-aio-redis:
-          condition: service_started
-          required: false
-      - nextcloud-aio-clamav:
-          condition: service_started
-          required: false
-      - nextcloud-aio-fulltextsearch:
-          condition: service_started
-          required: false
-      - nextcloud-aio-talk-recording:
-          condition: service_started
-          required: false
-      - nextcloud-aio-imaginary:
-          condition: service_started
-          required: false
+      nextcloud-aio-database:
+        condition: service_started
+        required: false
+      nextcloud-aio-redis:
+        condition: service_started
+        required: false
+      nextcloud-aio-clamav:
+        condition: service_started
+        required: false
+      nextcloud-aio-fulltextsearch:
+        condition: service_started
+        required: false
+      nextcloud-aio-talk-recording:
+        condition: service_started
+        required: false
+      nextcloud-aio-imaginary:
+        condition: service_started
+        required: false
     image: nextcloud/aio-nextcloud:latest
     expose:
       - "9000"

diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh
@@ -20,7 +20,7 @@ OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].nextcloud_exec_commands)')"
 OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-watchtower"))')"
 OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-domaincheck"))')"
 OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-borgbackup"))')"
-OUTPUT="$(echo "$OUTPUT" | jq '.services[] |= if has("depends_on") then .depends_on |= map({ (.): { "condition": "service_started", "required": false } }) else . end')"
+OUTPUT="$(echo "$OUTPUT" | jq '.services[] |= if has("depends_on") then .depends_on |= map({ (.): { "condition": "service_started", "required": false } }) else . end' | jq '.services[] |= if has("depends_on") then .depends_on |= reduce .[] as $item ({}; . + $item) else . end')"
 
 snap install yq
 mkdir -p ./manual-install
@@ -112,7 +112,7 @@ for name in "${NAMES[@]}"
 do
     OUTPUT="$(echo "$OUTPUT" | sed "/container_name.*$name$/i\ \ $name:")"
     if [ "$name" != "nextcloud-aio-apache" ]; then
-        OUTPUT="$(echo "$OUTPUT" | sed "/  $name:/i\ ")"
+        OUTPUT="$(echo "$OUTPUT" | sed "/^  $name:/i\ ")"
     fi
 done