Merge pull request from nextcloud/aio-yaml-update

Yaml updates
This commit is contained in:
Simon L 2022-12-29 10:14:25 +01:00 committed by GitHub
commit d0ab26918f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,7 +2,6 @@ version: "3.8"
services: services:
nextcloud-aio-apache: nextcloud-aio-apache:
container_name: nextcloud-aio-apache
depends_on: depends_on:
- nextcloud-aio-onlyoffice - nextcloud-aio-onlyoffice
- nextcloud-aio-collabora - nextcloud-aio-collabora
@ -30,7 +29,6 @@ services:
- nextcloud-aio - nextcloud-aio
nextcloud-aio-database: nextcloud-aio-database:
container_name: nextcloud-aio-database
image: nextcloud/aio-postgresql:${IMAGE_TAG} image: nextcloud/aio-postgresql:${IMAGE_TAG}
volumes: volumes:
- nextcloud_aio_database:/var/lib/postgresql/data:rw - nextcloud_aio_database:/var/lib/postgresql/data:rw
@ -47,7 +45,6 @@ services:
- nextcloud-aio - nextcloud-aio
nextcloud-aio-nextcloud: nextcloud-aio-nextcloud:
container_name: nextcloud-aio-nextcloud
depends_on: depends_on:
- nextcloud-aio-database - nextcloud-aio-database
- nextcloud-aio-redis - nextcloud-aio-redis
@ -106,34 +103,35 @@ services:
- nextcloud-aio - nextcloud-aio
nextcloud-aio-redis: nextcloud-aio-redis:
container_name: nextcloud-aio-redis
image: nextcloud/aio-redis:${IMAGE_TAG} image: nextcloud/aio-redis:${IMAGE_TAG}
environment: environment:
- REDIS_HOST_PASSWORD=${REDIS_PASSWORD} - REDIS_HOST_PASSWORD=${REDIS_PASSWORD}
- TZ=${TIMEZONE} - TZ=${TIMEZONE}
volumes:
- nextcloud_aio_redis:/data:rw
stop_grace_period: 10s stop_grace_period: 10s
restart: unless-stopped restart: unless-stopped
networks: networks:
- nextcloud-aio - nextcloud-aio
nextcloud-aio-collabora: nextcloud-aio-collabora:
container_name: nextcloud-aio-collabora
image: nextcloud/aio-collabora:${IMAGE_TAG}
profiles: ["collabora"] profiles: ["collabora"]
image: nextcloud/aio-collabora:${IMAGE_TAG}
environment: environment:
- aliasgroup1=https://${NC_DOMAIN}:443 - aliasgroup1=https://${NC_DOMAIN}:443
- extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true ${COLLABORA_SECCOMP_POLICY} - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true ${COLLABORA_SECCOMP_POLICY}
- dictionaries=${COLLABORA_DICTIONARIES} - dictionaries=${COLLABORA_DICTIONARIES}
- TZ=${TIMEZONE} - TZ=${TIMEZONE}
volumes:
- nextcloud_aio_collabora_fonts:/opt/cool/systemplate/tmpfonts:rw
stop_grace_period: 10s stop_grace_period: 10s
restart: unless-stopped restart: unless-stopped
networks: networks:
- nextcloud-aio - nextcloud-aio
nextcloud-aio-talk: nextcloud-aio-talk:
container_name: nextcloud-aio-talk
image: nextcloud/aio-talk:${IMAGE_TAG}
profiles: ["talk"] profiles: ["talk"]
image: nextcloud/aio-talk:${IMAGE_TAG}
ports: ports:
- ${TALK_PORT}:${TALK_PORT}/tcp - ${TALK_PORT}:${TALK_PORT}/tcp
- ${TALK_PORT}:${TALK_PORT}/udp - ${TALK_PORT}:${TALK_PORT}/udp
@ -150,11 +148,11 @@ services:
- nextcloud-aio - nextcloud-aio
nextcloud-aio-clamav: nextcloud-aio-clamav:
container_name: nextcloud-aio-clamav
image: nextcloud/aio-clamav:${IMAGE_TAG}
profiles: ["clamav"] profiles: ["clamav"]
image: nextcloud/aio-clamav:${IMAGE_TAG}
environment: environment:
- TZ=${TIMEZONE} - TZ=${TIMEZONE}
- CLAMD_STARTUP_TIMEOUT=90
volumes: volumes:
- nextcloud_aio_clamav:/var/lib/clamav:rw - nextcloud_aio_clamav:/var/lib/clamav:rw
stop_grace_period: 10s stop_grace_period: 10s
@ -163,9 +161,8 @@ services:
- nextcloud-aio - nextcloud-aio
nextcloud-aio-onlyoffice: nextcloud-aio-onlyoffice:
container_name: nextcloud-aio-onlyoffice
image: nextcloud/aio-onlyoffice:${IMAGE_TAG}
profiles: ["onlyoffice"] profiles: ["onlyoffice"]
image: nextcloud/aio-onlyoffice:${IMAGE_TAG}
environment: environment:
- TZ=${TIMEZONE} - TZ=${TIMEZONE}
- JWT_ENABLED=true - JWT_ENABLED=true
@ -179,9 +176,8 @@ services:
- nextcloud-aio - nextcloud-aio
nextcloud-aio-imaginary: nextcloud-aio-imaginary:
container_name: nextcloud-aio-imaginary
image: nextcloud/aio-imaginary:${IMAGE_TAG}
profiles: ["imaginary"] profiles: ["imaginary"]
image: nextcloud/aio-imaginary:${IMAGE_TAG}
environment: environment:
- TZ=${TIMEZONE} - TZ=${TIMEZONE}
stop_grace_period: 10s stop_grace_period: 10s
@ -190,9 +186,8 @@ services:
- nextcloud-aio - nextcloud-aio
nextcloud-aio-fulltextsearch: nextcloud-aio-fulltextsearch:
container_name: nextcloud-aio-fulltextsearch
image: nextcloud/aio-fulltextsearch:${IMAGE_TAG}
profiles: ["fulltextsearch"] profiles: ["fulltextsearch"]
image: nextcloud/aio-fulltextsearch:${IMAGE_TAG}
environment: environment:
- TZ=${TIMEZONE} - TZ=${TIMEZONE}
- discovery.type=single-node - discovery.type=single-node
@ -209,6 +204,8 @@ volumes:
name: nextcloud_aio_apache name: nextcloud_aio_apache
nextcloud_aio_clamav: nextcloud_aio_clamav:
name: nextcloud_aio_clamav name: nextcloud_aio_clamav
nextcloud_aio_collabora_fonts:
name: nextcloud_aio_collabora_fonts
nextcloud_aio_database: nextcloud_aio_database:
name: nextcloud_aio_database name: nextcloud_aio_database
nextcloud_aio_database_dump: nextcloud_aio_database_dump:
@ -219,6 +216,8 @@ volumes:
name: nextcloud_aio_nextcloud name: nextcloud_aio_nextcloud
nextcloud_aio_onlyoffice: nextcloud_aio_onlyoffice:
name: nextcloud_aio_onlyoffice name: nextcloud_aio_onlyoffice
nextcloud_aio_redis:
name: nextcloud_aio_redis
nextcloud_aio_nextcloud_data: nextcloud_aio_nextcloud_data:
name: nextcloud_aio_nextcloud_data name: nextcloud_aio_nextcloud_data