diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 7d34e89..1a8a471 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -9,8 +9,6 @@ services: - POSTGRES_DB=${POSTGRES_DB} volumes: - ${APPDATA_PATH}/nextcloud/db:/var/lib/postgresql/data - ports: - - ${DB_PORT}:5432 networks: - backend healthcheck: @@ -27,8 +25,6 @@ services: command: valkey-server --save 60 1 --requirepass ${VALKEY_PASSWORD} volumes: - ${APPDATA_PATH}/nextcloud/valkey:/data - ports: - - ${VALKEY_PORT}:6379 networks: - backend healthcheck: @@ -38,34 +34,15 @@ services: retries: 3 start_period: 10s - nextcloud_app: + nextcloud: image: docker.io/library/nextcloud:31.0.7 - container_name: nextcloud_app + container_name: nextcloud restart: unless-stopped depends_on: nextcloud_db: condition: service_healthy nextcloud_valkey: condition: service_healthy - labels: - - traefik-instance=${TRAEFIK_INSTANCE} - - traefik.enable=true - - traefik.http.routers.nextcloud.rule=Host(`${TRAEFIK_DOMAIN}`) - - traefik.http.routers.nextcloud.entrypoints=websecure - - traefik.http.services.nextcloud.loadbalancer.server.port=80 - - traefik.http.services.nextcloud.loadbalancer.passhostheader=true - - traefik.http.routers.nextcloud.middlewares=nextcloud-redirectregex1,nextcloud-redirectregex2,compresstraefik,nextcloud-securityheaders - - traefik.http.middlewares.compresstraefik.compress=true - - traefik.http.middlewares.nextcloud-redirectregex1.redirectregex.permanent=true - - traefik.http.middlewares.nextcloud-redirectregex1.redirectregex.regex=https?://([^/]*)/.well-known/(card|cal)dav - - traefik.http.middlewares.nextcloud-redirectregex1.redirectregex.replacement=https://$${1}/remote.php/dav/ - - traefik.http.middlewares.nextcloud-redirectregex2.redirectregex.permanent=true - - traefik.http.middlewares.nextcloud-redirectregex2.redirectregex.regex=https?://([^/]*)(/.well-known[^#]*) - - traefik.http.middlewares.nextcloud-redirectregex2.redirectregex.replacement=https://$${1}/index.php$${2} - - traefik.http.middlewares.nextcloud-securityheaders.headers.stsSeconds=15552000 - - traefik.http.middlewares.nextcloud-securityheaders.headers.stsIncludeSubdomains=true - - traefik.http.middlewares.nextcloud-securityheaders.headers.stsPreload=true - - traefik.docker.network=frontend environment: - POSTGRES_HOST=nextcloud_db:5432 - POSTGRES_DB=${POSTGRES_DB} @@ -91,7 +68,7 @@ services: container_name: nextcloud_cron restart: unless-stopped depends_on: - - nextcloud_app + - nextcloud entrypoint: /cron.sh environment: - POSTGRES_HOST=nextcloud_db:5432