eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-21 23:16:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #3118 from nextcloud/fix-compose

Browse source 
update update-yaml.sh follow-up
This commit is contained in:
Simon L 2023-08-09 14:48:34 +02:00 • committed by GitHub
commit 7fb3e4c4fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

22
manual-install/latest.yml
View file

@ -1,19 +1,19 @@
services: services:
nextcloud-aio-apache: nextcloud-aio-apache:
depends_on: depends_on:
- nextcloud-aio-onlyoffice: nextcloud-aio-onlyoffice:
condition: service_started condition: service_started
required: false required: false
- nextcloud-aio-collabora: nextcloud-aio-collabora:
condition: service_started condition: service_started
required: false required: false
- nextcloud-aio-talk: nextcloud-aio-talk:
condition: service_started condition: service_started
required: false required: false
- nextcloud-aio-nextcloud: nextcloud-aio-nextcloud:
condition: service_started condition: service_started
required: false required: false
- nextcloud-aio-notify-push: nextcloud-aio-notify-push:
condition: service_started condition: service_started
required: false required: false
image: nextcloud/aio-apache:latest image: nextcloud/aio-apache:latest
@ -69,22 +69,22 @@ services:
nextcloud-aio-nextcloud: nextcloud-aio-nextcloud:
depends_on: depends_on:
- nextcloud-aio-database: nextcloud-aio-database:
condition: service_started condition: service_started
required: false required: false
- nextcloud-aio-redis: nextcloud-aio-redis:
condition: service_started condition: service_started
required: false required: false
- nextcloud-aio-clamav: nextcloud-aio-clamav:
condition: service_started condition: service_started
required: false required: false
- nextcloud-aio-fulltextsearch: nextcloud-aio-fulltextsearch:
condition: service_started condition: service_started
required: false required: false
- nextcloud-aio-talk-recording: nextcloud-aio-talk-recording:
condition: service_started condition: service_started
required: false required: false
- nextcloud-aio-imaginary: nextcloud-aio-imaginary:
condition: service_started condition: service_started
required: false required: false
image: nextcloud/aio-nextcloud:latest image: nextcloud/aio-nextcloud:latest

4
manual-install/update-yaml.sh
View file

@ -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-watchtower"))')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-domaincheck"))')" 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 '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 snap install yq
mkdir -p ./manual-install mkdir -p ./manual-install
@ -112,7 +112,7 @@ for name in "${NAMES[@]}"
do do
OUTPUT="$(echo "$OUTPUT" | sed "/container_name.*$name$/i\ \ $name:")" OUTPUT="$(echo "$OUTPUT" | sed "/container_name.*$name$/i\ \ $name:")"
if [ "$name" != "nextcloud-aio-apache" ]; then if [ "$name" != "nextcloud-aio-apache" ]; then
OUTPUT="$(echo "$OUTPUT" | sed "/ $name:/i\ ")" OUTPUT="$(echo "$OUTPUT" | sed "/^ $name:/i\ ")"
fi fi
done done