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).
This commit is contained in:
+7
-13
@@ -214,7 +214,7 @@ services:
|
||||
- postgres_p
|
||||
|
||||
redis:
|
||||
image: redis:8.10.1
|
||||
image: redis:8.10.2
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
@@ -273,13 +273,12 @@ services:
|
||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||
|
||||
collabora:
|
||||
image: collabora/code:25.04.10.3.1
|
||||
entrypoint: >
|
||||
sh -c "
|
||||
export password=\"$$(cat /run/secrets/collabora_p)\" &&
|
||||
exec /start-collabora-online.sh"
|
||||
image: collabora/code:26.04.4.1.1
|
||||
# 26.04 images exec coolwsd directly (--use-env-vars; no shell in the image),
|
||||
# so ssl options are passed as args and the panel password comes from the env.
|
||||
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
|
||||
@@ -288,11 +287,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"
|
||||
@@ -422,9 +419,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}
|
||||
Reference in New Issue
Block a user