From c11f3f494eddf9da1ca31e936a9ba49562c2a263 Mon Sep 17 00:00:00 2001
From: Andrew Salib <andrew.salib@kasada.io>
Date: Sun, 9 Nov 2025 20:02:24 +1100
Subject: [PATCH] Upgrade to Nextcloud v32 + add custom mount for data

---
 compose.fulltextsearch.yml |  4 ++--
 compose.whiteboard.yml     |  2 +-
 compose.yml                | 28 ++++++++++++++++++----------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/compose.fulltextsearch.yml b/compose.fulltextsearch.yml
index 0567b64..473cf7b 100644
--- a/compose.fulltextsearch.yml
+++ b/compose.fulltextsearch.yml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   elasticsearch:
-    image: "docker.elastic.co/elasticsearch/elasticsearch:8.17.2"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.6"
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -29,7 +29,7 @@ services:
         mode: 0600
 
   searchindexer:
-    image: nextcloud:31.0.6-fpm
+    image: nextcloud:32.0.1-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached
diff --git a/compose.whiteboard.yml b/compose.whiteboard.yml
index a1cf529..a448e3a 100644
--- a/compose.whiteboard.yml
+++ b/compose.whiteboard.yml
@@ -6,7 +6,7 @@ services:
       - whiteboard_jwt
 
   whiteboard:
-    image: ghcr.io/nextcloud-releases/whiteboard:v1.1.2
+    image: ghcr.io/nextcloud-releases/whiteboard:v1.4.1
     deploy:
       labels:
         - traefik.enable=true
diff --git a/compose.yml b/compose.yml
index 388aacf..6c831a6 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   web:
-    image: nginx:1.29.0
+    image: nginx:1.29.3
     depends_on:
       - app
     configs:
@@ -17,7 +17,7 @@ services:
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached
-      - nextdata:/var/www/html/data:cached
+      - /mnt/data-3t/nextdata:/var/www/html/data:cached
       - nextconfig:/var/www/html/config:cached
       - ${EXTRA_VOLUME}
     networks:
@@ -30,13 +30,22 @@ services:
       labels:
         - "traefik.enable=true"
         - "traefik.docker.network=proxy"
+        # shared service & middleware
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
+        # public domain (lets-encrypt cert)
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
-        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
-        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
+        # local domain (self-signed cert)
+        - "traefik.http.routers.${STACK_NAME}-local.rule=Host(`${LOCAL_DOMAIN}`)"
+        - "traefik.http.routers.${STACK_NAME}-local.tls=true"
+        - "traefik.http.routers.${STACK_NAME}-local.entrypoints=web-secure"
+        - "traefik.http.routers.${STACK_NAME}-local.middlewares=${STACK_NAME}-redirect"
+        - "traefik.http.routers.${STACK_NAME}-local.service=${STACK_NAME}"
+
         - "caddy=${DOMAIN}"
         - "caddy.reverse_proxy={{upstreams 80}}"
         - "caddy.tls.on_demand="
@@ -48,7 +57,7 @@ services:
       start_period: 5m
 
   app:
-    image: nextcloud:31.0.6-fpm
+    image: nextcloud:32.0.1-fpm
     depends_on:
       - db
     configs:
@@ -85,7 +94,7 @@ services:
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached
-      - nextdata:/var/www/html/data:cached
+      - /mnt/data-3t/nextdata:/var/www/html/data:cached
       - nextconfig:/var/www/html/config:cached
       - ${EXTRA_VOLUME}
     networks:
@@ -109,11 +118,11 @@ services:
       start_period: 15m
 
   cron:
-    image: nextcloud:31.0.6-fpm
+    image: nextcloud:32.0.1-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached
-      - nextdata:/var/www/html/data:cached
+      - /mnt/data-3t/nextdata:/var/www/html/data:cached
       - nextconfig:/var/www/html/config:cached
       - ${EXTRA_VOLUME}
     networks:
@@ -125,7 +134,7 @@ services:
 
 
   cache:
-    image: redis:8.0.2-alpine
+    image: redis:8.2.3-alpine
     networks:
       - internal
     volumes:
@@ -147,7 +156,6 @@ secrets:
 volumes:
   nextcloud:
   nextapps:
-  nextdata:
   nextconfig:
   redis: