Merge pull request #3096 from nextcloud/fix-compose

Update update-yaml.sh
This commit is contained in:
Simon L 2023-08-09 09:53:57 +02:00 committed by GitHub
commit 3a66c329ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 11 deletions

View file

@ -1,11 +1,21 @@
services: services:
nextcloud-aio-apache: nextcloud-aio-apache:
depends_on: depends_on:
- nextcloud-aio-onlyoffice - nextcloud-aio-onlyoffice:
- nextcloud-aio-collabora condition: service_started
- nextcloud-aio-talk required: false
- nextcloud-aio-nextcloud - nextcloud-aio-collabora:
- nextcloud-aio-notify-push 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 image: nextcloud/aio-apache:latest
ports: ports:
- ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/tcp - ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/tcp
@ -59,12 +69,24 @@ services:
nextcloud-aio-nextcloud: nextcloud-aio-nextcloud:
depends_on: depends_on:
- nextcloud-aio-database - nextcloud-aio-database:
- nextcloud-aio-redis condition: service_started
- nextcloud-aio-clamav required: false
- nextcloud-aio-fulltextsearch - nextcloud-aio-redis:
- nextcloud-aio-talk-recording condition: service_started
- nextcloud-aio-imaginary 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 image: nextcloud/aio-nextcloud:latest
expose: expose:
- "9000" - "9000"

View file

@ -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-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')"
snap install yq snap install yq
mkdir -p ./manual-install mkdir -p ./manual-install