From 2efeef39c5fa99fbe3f061fc7baac2da6ab933aa Mon Sep 17 00:00:00 2001
From: compute <compute@sporada.eu>
Date: Wed, 17 Dec 2025 15:16:56 +0000
Subject: [PATCH] update for Nextcloud 32

---
 nextcloud/Dockerfile         |  2 +-
 nextcloud/docker-compose.yml | 15 ++++++---------
 traefik/docker-compose.yml   |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index cb00823..4ab14b2 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -1,4 +1,4 @@
-FROM nextcloud:28
+FROM nextcloud:32
 
 RUN set -ex; \
 \
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index c7c97c0..043f920 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -44,11 +44,8 @@ services:
       - nextcloud-redis
     container_name: nextcloud-app
     command: >
-      bash -c 'chown -R www-data:www-data ${NEXTCLOUD_DATA_DIR} && chown -R www-data:www-data /var/www/html && chmod 755 ${NEXTCLOUD_DATA_DIR}/.ocdata && /entrypoint.sh apache2-foreground'
+      bash -c 'chown -R www-data:www-data ${NEXTCLOUD_DATA_DIR} && chown -R www-data:www-data ${NEXTCLOUD_HTML_DIR} && chmod 755 ${NEXTCLOUD_DATA_DIR}/.ocdata && /entrypoint.sh apache2-foreground'
     env_file: live.env
-    environment:
-      - NEXTCLOUD_TRUSTED_DOMAINS='${NEXTCLOUD_FQDN}'
-      - NEXTCLOUD_DATA_DIR='${NEXTCLOUD_DATA_DIR}'
     extra_hosts:
       - "${NEXTCLOUD_FQDN}:${TRAEFIK_CONTAINER_IP}"
       - "${COLLABORA_FQDN}:${TRAEFIK_CONTAINER_IP}"
@@ -81,19 +78,19 @@ services:
       - default
     restart: unless-stopped
     volumes:
-      - ${NEXTCLOUD_ROOT}/html:/var/www/html
+      - ${NEXTCLOUD_ROOT}/html:${NEXTCLOUD_HTML_DIR}
       - ${NEXTCLOUD_ROOT}/data:${NEXTCLOUD_DATA_DIR}
 
   nextcloud-cron:
-    image: nextcloud:28
+    image: nextcloud:32
     container_name: nextcloud-cron
     command: >
-      bash -c 'chown -R www-data:www-data ${NEXTCLOUD_DATA_DIR} && chown -R www-data:www-data /var/www/html && chmod 755 ${NEXTCLOUD_DATA_DIR}/.ocdata && /entrypoint.sh apache2-foreground'
+      bash -c 'chown -R www-data:www-data ${NEXTCLOUD_DATA_DIR} && chown -R www-data:www-data ${NEXTCLOUD_HTML_DIR} && chmod 755 ${NEXTCLOUD_DATA_DIR}/.ocdata && /entrypoint.sh apache2-foreground'
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
     restart: unless-stopped
     volumes:
-      - ${NEXTCLOUD_ROOT}/html:/var/www/html
+      - ${NEXTCLOUD_ROOT}/html:${NEXTCLOUD_HTML_DIR}
       - ${NEXTCLOUD_ROOT}/data:${NEXTCLOUD_DATA_DIR}
     entrypoint: /cron.sh
     depends_on:
@@ -120,7 +117,7 @@ services:
         - --static-auth-secret=${COTURN_SECRET}
 
   nextcloud-collabora:
-    image: collabora/code:23.05.9.1.1
+    image: collabora/code:latest
     container_name: nextcloud-collabora
     env_file: live.env
     extra_hosts:
diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 78b3a54..a6a67b3 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -89,7 +89,7 @@ services:
     # Always restart also at boot unless manually stopped
     restart: unless-stopped
     # The official v3 Traefik docker image
-    image: traefik:3.0
+    image: traefik:3.6
     networks:
       default:
         ipv4_address: 172.27.0.100