From da4ced725f53e53e3c65622df7f979fe5b475ba2 Mon Sep 17 00:00:00 2001 From: Zoey Date: Wed, 9 Aug 2023 11:34:37 +0200 Subject: [PATCH 1/4] fix https://github.com/nextcloud/all-in-one/pull/3096#issuecomment-1670940790 Signed-off-by: Zoey --- manual-install/update-yaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index cde58ed9..4e642759 100644 --- 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 From f1e9e9bf30fd8032082476c3a65021db481d6cf4 Mon Sep 17 00:00:00 2001 From: Zoey Date: Wed, 9 Aug 2023 11:36:56 +0200 Subject: [PATCH 2/4] readd Signed-off-by: Zoey --- manual-install/update-yaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 4e642759..548df2f9 100644 --- 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' | jq '.services[] |= if has("depends_on") then .depends_on |= reduce .[] as $item ({}; . + $item) 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 From f280f09b6c2facdad25b9def28ac9528611d877b Mon Sep 17 00:00:00 2001 From: Simon L Date: Wed, 9 Aug 2023 14:45:38 +0200 Subject: [PATCH 3/4] try to fix detail Signed-off-by: Simon L --- manual-install/update-yaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 548df2f9..39ac7c37 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -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 From db860d24af0230ac78f52824ee189bb76f10ee40 Mon Sep 17 00:00:00 2001 From: szaimen Date: Wed, 9 Aug 2023 12:46:21 +0000 Subject: [PATCH 4/4] Yaml updates Signed-off-by: GitHub --- manual-install/latest.yml | 68 +++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/manual-install/latest.yml b/manual-install/latest.yml index 382207ce..e13cad80 100644 --- 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" @@ -141,7 +141,7 @@ services: networks: - nextcloud-aio tmpfs: - - /tmp + - /tmp:exec nextcloud-aio-notify-push: image: nextcloud/aio-notify-push:latest