adapt env sample

.env.sample

@@ -6,6 +6,8 @@ ENABLE_BACKUPS=true
 DOMAIN=nextcloud.example.com
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.nextcloud.example.com`'
+# same list as above but space separated
+#EXTRA_DOMAINS_TRUSTED=cloud.coquest.coop
 LETS_ENCRYPT_ENV=production
 
 COMPOSE_FILE="compose.yml"

compose.fulltextsearch.yml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   elasticsearch:
-    image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.19"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.16"
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -29,7 +29,7 @@ services:
         mode: 0600
 
   searchindexer:
-    image: nextcloud:32-fpm
+    image: nextcloud:32.0.12-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached

compose.mariadb.yml

@@ -9,7 +9,7 @@ services:
       - MYSQL_PASSWORD_FILE=/run/secrets/db_password
 
   db:
-    image: "mariadb:12.3"
+    image: "mariadb:11.4"
     environment:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud

compose.postgres.yml

@@ -11,8 +11,7 @@ services:
 
   db:
     image: "pgautoupgrade/pgautoupgrade:14-debian"
-    #setting max_connections with -c breaks pgautoupgrade
-    #command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
+    command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
     volumes:
       - "postgres:/var/lib/postgresql/data"
     networks:
@@ -23,11 +22,11 @@ services:
       POSTGRES_DB: nextcloud
     secrets:
       - db_password
-    # The pgautoupgrade image already ships its own HEALTHCHECK.
-    # This runs pg_isready but also takes into accounts if pg_upgrade is being run.
-    # No need to override it here.
-    # healthcheck:
-    #   test: ["CMD", "/usr/local/bin/pgautoupgrade-healthcheck.sh"]
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready", "-U", "nextcloud"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
     deploy:
       labels:
         backupbot.backup.pre-hook: "/pg_backup.sh backup"

compose.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   web:
-    image: nginx:1.31.3
+    image: nginx:1.31.1
     depends_on:
       - app
     configs:
@@ -48,7 +48,7 @@ services:
       start_period: 5m
 
   app:
-    image: nextcloud:32-fpm
+    image: nextcloud:32.0.12-fpm
     depends_on:
       - db
     configs:
@@ -70,7 +70,8 @@ services:
       - STACK_NAME
       - NEXTCLOUD_ADMIN_USER=${ADMIN_USER}
       - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/admin_password
-      - NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
+      - EXTRA_DOMAINS_TRUSTED
+      - NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN} ${EXTRA_DOMAINS_TRUSTED}
       - TRUSTED_PROXIES=10.0.0.0/8
       - REDIS_HOST=cache
       - OVERWRITEPROTOCOL=https
@@ -95,7 +96,7 @@ services:
         failure_action: rollback
         order: start-first
       labels:
-        - "coop-cloud.${STACK_NAME}.version=13.2.0+32-fpm"
+        - "coop-cloud.${STACK_NAME}.version=13.1.0+32.0.11-fpm"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
         - "backupbot.backup.volumes.redis=false"
@@ -109,7 +110,7 @@ services:
       start_period: 15m
 
   cron:
-    image: nextcloud:32-fpm
+    image: nextcloud:32.0.12-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached
@@ -125,7 +126,7 @@ services:
 
 
   cache:
-    image: redis:8.8.1-alpine
+    image: redis:8.8.0-alpine
     networks:
       - internal
     volumes:
@@ -154,7 +155,7 @@ volumes:
 
 configs:
   nginx_conf:
-    name: ${STACK_NAME}_nginx_conf_${NGINX_CONF_VERSION}
+    name: ${STACK_NAME}_nginx_${NGINX_CONF_VERSION}
     file: nginx.conf.tmpl
     template_driver: golang
   fpm_tune:

release/13.1.4+32.0.13-fpm

@@ -1,4 +0,0 @@
-    chore(deps): update mariadb docker tag to v12
-    chore(deps): update mariadb docker tag to v11.8
-    chore(deps): update nginx docker tag to v1.31.3
-    chore(deps): update docker.elastic.co/elasticsearch/elasticsearch docker tag to v8.19.19

release/13.1.5+32.0.13-fpm

@@ -1,2 +0,0 @@
-Important:
-The pgautoupgrade switch from 13.1.0+32.0.11-fpm was released untested and had a bug: the db service's `-c max_connections=...` command breaks pgautoupgrade, failing with `initdb: invalid option -- 'c'`. If your db got stuck mid-upgrade on 13.1.0-13.1.4 with that error: restore the old data dir and remove the upgrade lock file. Then redeploy this version.

release/13.2.0+32-fpm

@@ -1 +0,0 @@
-Last release for nextcloud-32, pointing to the latest version of nextcloud-32.