Compare commits

...
Author SHA1 Message Date
autonomic-bot ce5308c7f5 chore: upgrade lasuite-drive redis to 8.10.2, collabora to 26.04.4.1.1
cc-ci/testme cc-ci: failure
collabora 26.04 images exec coolwsd directly (--use-env-vars; no shell in the
image), so the sh/start-collabora-online.sh entrypoint and extra_params env are
gone: ssl options move to command args, the healthcheck switches to
coolwsd --probe, and the admin panel password moves from the collabora_p
docker secret to the COLLABORA_ADMIN_PASSWORD env var (empty = locked).

redis 8.10.2 is a security release (transaction ACL-revocation bypass,
unauthenticated cluster-bus join; cache sidecar, no cluster mode here).
2026-09-21 21:20:55 +00:00
2 changed files with 12 additions and 17 deletions
+5 -4
View File
@@ -28,8 +28,6 @@ SECRET_MINIO_RU_VERSION=v1
SECRET_POSTGRES_P_VERSION=v1 SECRET_POSTGRES_P_VERSION=v1
# DJANGO_HOST_EMAIL_PASSWORD # DJANGO_HOST_EMAIL_PASSWORD
SECRET_EMAIL_PASS_VERSION=v1 SECRET_EMAIL_PASS_VERSION=v1
# COLLABORA_ADMIN_PASSWORD
SECRET_COLLABORA_P_VERSION=v1
############################################################################## ##############################################################################
# EMAIL # EMAIL
@@ -77,9 +75,12 @@ LOGGING_LEVEL_LOGGERS_APP=INFO
############################################################################## ##############################################################################
# COLLABORA ADMIN PANEL # COLLABORA ADMIN PANEL
############################################################################## ##############################################################################
# Username for the Collabora admin panel (https://COLLABORA_DOMAIN/browser/dist/admin/admin.html) # Credentials for the Collabora admin panel (https://COLLABORA_DOMAIN/browser/dist/admin/admin.html)
# Password is managed via Docker secret 'collabora_p' # 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_USERNAME=admin
#COLLABORA_ADMIN_PASSWORD=
############################################################################## ##############################################################################
# BACKUPS # BACKUPS
+7 -13
View File
@@ -214,7 +214,7 @@ services:
- postgres_p - postgres_p
redis: redis:
image: redis:8.10.1 image: redis:8.10.2
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "ping"] test: ["CMD", "redis-cli", "ping"]
interval: 10s interval: 10s
@@ -273,13 +273,12 @@ services:
- "backupbot.backup=${ENABLE_BACKUPS:-true}" - "backupbot.backup=${ENABLE_BACKUPS:-true}"
collabora: collabora:
image: collabora/code:25.04.10.3.1 image: collabora/code:26.04.4.1.1
entrypoint: > # 26.04 images exec coolwsd directly (--use-env-vars; no shell in the image),
sh -c " # so ssl options are passed as args and the panel password comes from the env.
export password=\"$$(cat /run/secrets/collabora_p)\" && command: ["--o:ssl.enable=false", "--o:ssl.termination=true"]
exec /start-collabora-online.sh"
healthcheck: healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost:9980/hosting/discovery" ] test: [ "CMD", "/usr/bin/coolwsd", "--probe", "--o:ssl.enable=false" ]
interval: 30s interval: 30s
retries: 5 retries: 5
start_period: 60s start_period: 60s
@@ -288,11 +287,9 @@ services:
- backend - backend
- proxy - proxy
environment: environment:
- extra_params=--o:ssl.enable=false --o:ssl.termination=true
- username=${COLLABORA_ADMIN_USERNAME:-admin} - username=${COLLABORA_ADMIN_USERNAME:-admin}
- server_name=${COLLABORA_DOMAIN} - server_name=${COLLABORA_DOMAIN}
secrets: - password=${COLLABORA_ADMIN_PASSWORD:-}
- collabora_p
deploy: deploy:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
@@ -422,9 +419,6 @@ secrets:
minio_ru: minio_ru:
external: true external: true
name: ${STACK_NAME}_minio_ru_${SECRET_MINIO_RU_VERSION} name: ${STACK_NAME}_minio_ru_${SECRET_MINIO_RU_VERSION}
collabora_p:
external: true
name: ${STACK_NAME}_collabora_p_${SECRET_COLLABORA_P_VERSION}
email_pass: email_pass:
external: true external: true
name: ${STACK_NAME}_email_pass_${SECRET_EMAIL_PASS_VERSION} name: ${STACK_NAME}_email_pass_${SECRET_EMAIL_PASS_VERSION}