From 2ce9d26cf92f6e7e61fd47fd21413cf6b4f28c3d Mon Sep 17 00:00:00 2001 From: Zoey Date: Sun, 6 Aug 2023 13:09:05 +0200 Subject: [PATCH 1/3] Update update-yaml.sh Signed-off-by: Zoey --- manual-install/update-yaml.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 70e1b8a5..40316589 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -20,6 +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[].depends_on |= map({ (.): { "condition": "service_started", "required": false } })')" snap install yq mkdir -p ./manual-install From 791c381706b030fdaec988c99a522e661e2b5a45 Mon Sep 17 00:00:00 2001 From: Zoey Date: Tue, 8 Aug 2023 20:38:24 +0200 Subject: [PATCH 2/3] fix jq command 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 40316589..cde58ed9 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[].depends_on |= map({ (.): { "condition": "service_started", "required": false } })')" +OUTPUT="$(echo "$OUTPUT" | jq '.services[] |= if has("depends_on") then .depends_on |= map({ (.): { "condition": "service_started", "required": false } }) else . end')" snap install yq mkdir -p ./manual-install From 76a40d97bc41a578458f0cf932970cc8ba69b461 Mon Sep 17 00:00:00 2001 From: szaimen Date: Tue, 8 Aug 2023 18:41:49 +0000 Subject: [PATCH 3/3] Yaml updates Signed-off-by: GitHub --- manual-install/latest.yml | 44 +++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/manual-install/latest.yml b/manual-install/latest.yml index 0c5b7a19..382207ce 100644 --- a/manual-install/latest.yml +++ b/manual-install/latest.yml @@ -1,11 +1,21 @@ services: nextcloud-aio-apache: depends_on: - - nextcloud-aio-onlyoffice - - nextcloud-aio-collabora - - nextcloud-aio-talk - - nextcloud-aio-nextcloud - - nextcloud-aio-notify-push + - 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 @@ -59,12 +69,24 @@ services: nextcloud-aio-nextcloud: depends_on: - - nextcloud-aio-database - - nextcloud-aio-redis - - nextcloud-aio-clamav - - nextcloud-aio-fulltextsearch - - nextcloud-aio-talk-recording - - nextcloud-aio-imaginary + - 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"