.env.sample

@@ -28,8 +28,6 @@ SECRET_MINIO_RU_VERSION=v1
 SECRET_POSTGRES_P_VERSION=v1
 # DJANGO_HOST_EMAIL_PASSWORD
 SECRET_EMAIL_PASS_VERSION=v1
-# COLLABORA_ADMIN_PASSWORD
-SECRET_COLLABORA_P_VERSION=v1
 
 ##############################################################################
 # EMAIL
@@ -77,9 +75,12 @@ LOGGING_LEVEL_LOGGERS_APP=INFO
 ##############################################################################
 # COLLABORA ADMIN PANEL
 ##############################################################################
-# Username for the Collabora admin panel (https://COLLABORA_DOMAIN/browser/dist/admin/admin.html)
-# Password is managed via Docker secret 'collabora_p'
+# Credentials for the Collabora admin panel (https://COLLABORA_DOMAIN/browser/dist/admin/admin.html)
+# Since collabora 26.04 (image execs coolwsd directly; no shell in the image), the panel
+# password moved from the retired Docker secret 'collabora_p' to this env var.
+# Empty/unset = panel stays locked.
 #COLLABORA_ADMIN_USERNAME=admin
+#COLLABORA_ADMIN_PASSWORD=
 
 ##############################################################################
 # BACKUPS

compose.yml

@@ -95,7 +95,7 @@ services:
 
   app:
     user: "${DOCKER_USER:-1000}"
-    image: lasuite/drive-frontend:v0.25.0
+    image: lasuite/drive-frontend:v0.25.3
     networks:
       - backend
     deploy:
@@ -116,7 +116,7 @@ services:
 
   backend:
     user: ${DOCKER_USER:-1000}
-    image: lasuite/drive-backend:v0.25.0
+    image: lasuite/drive-backend:v0.25.3
     command: [ "gunicorn", "-c", "/usr/local/etc/gunicorn/drive.py", "drive.wsgi:application" ]
     entrypoint: >
       sh -c "if [ \"$$AUTO_MIGRATIONS\" = \"true\" ]; then /migrate.sh; fi && exec /abra-entrypoint.sh /usr/local/bin/entrypoint \"$$@\"" --
@@ -145,7 +145,7 @@ services:
 
   celery:
     user: ${DOCKER_USER:-1000}
-    image: lasuite/drive-backend:v0.25.0
+    image: lasuite/drive-backend:v0.25.3
     networks:
       - backend
     command: [ "celery", "-A", "drive.celery_app", "worker", "-l", "INFO" ]
@@ -167,7 +167,7 @@ services:
 
   celery-beat:
     user: ${DOCKER_USER:-1000}
-    image: lasuite/drive-backend:v0.25.0
+    image: lasuite/drive-backend:v0.25.3
     networks:
       - backend
     command: [ "celery", "-A", "drive.celery_app", "beat", "-l", "INFO", "--schedule", "/tmp/celerybeat-schedule" ]
@@ -214,7 +214,7 @@ services:
       - postgres_p
 
   redis:
-    image: redis:8.10.2
+    image: redis:8.10.3
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 10s
@@ -274,13 +274,12 @@ services:
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
 
   collabora:
-    image: collabora/code:26.04.5.1.1
-    entrypoint: >
-      sh -c "
-      export password=\"$$(cat /run/secrets/collabora_p)\" &&
-      exec /start-collabora-online.sh"
+    image: collabora/code:26.04.5.2.1
+    # 26.04 images exec coolwsd directly (no shell in the image), so ssl options are passed as
+    # args and the panel password comes from the env instead of a Docker secret.
+    command: ["--o:ssl.enable=false", "--o:ssl.termination=true"]
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:9980/hosting/discovery" ]
+      test: [ "CMD", "/usr/bin/coolwsd", "--probe", "--o:ssl.enable=false" ]
       interval: 30s
       retries: 5
       start_period: 60s
@@ -289,11 +288,9 @@ services:
       - backend
       - proxy
     environment:
-      - extra_params=--o:ssl.enable=false --o:ssl.termination=true
       - username=${COLLABORA_ADMIN_USERNAME:-admin}
       - server_name=${COLLABORA_DOMAIN}
-    secrets:
-      - collabora_p
+      - password=${COLLABORA_ADMIN_PASSWORD:-}
     deploy:
       labels:
       - "traefik.enable=true"
@@ -312,7 +309,7 @@ services:
       - "traefik.http.routers.${STACK_NAME}_collabora.middlewares=${STACK_NAME}_collabora-cors"
 
   onlyoffice:
-    image: onlyoffice/documentserver-de:10.0.0.1
+    image: onlyoffice/documentserver-de:10.0.2.1
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost/hosting/discovery" ]
       interval: 30s
@@ -351,7 +348,7 @@ services:
 
 
   web:
-    image: nginx:1.31.7
+    image: nginx:1.31.8
     configs:
       - source: nginx_conf
         target: /etc/nginx/conf.d/default.conf
@@ -423,9 +420,6 @@ secrets:
   minio_ru:
     external: true
     name: ${STACK_NAME}_minio_ru_${SECRET_MINIO_RU_VERSION}
-  collabora_p:
-    external: true
-    name: ${STACK_NAME}_collabora_p_${SECRET_COLLABORA_P_VERSION}
   email_pass:
     external: true
     name: ${STACK_NAME}_email_pass_${SECRET_EMAIL_PASS_VERSION}