Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ce5308c7f5 | ||
|
|
95489da91f | ||
|
|
217fb7da0d | ||
|
|
f89cbbc046 | ||
|
|
8324cf2730 | ||
|
|
2662398786 | ||
|
|
7f0164cb00 | ||
|
|
a02dd080ac | ||
|
|
4d80b26a64 |
+5
-4
@@ -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
|
||||
|
||||
+15
-21
@@ -95,14 +95,14 @@ services:
|
||||
|
||||
app:
|
||||
user: "${DOCKER_USER:-1000}"
|
||||
image: lasuite/drive-frontend:v0.21.0
|
||||
image: lasuite/drive-frontend:v0.22.0
|
||||
networks:
|
||||
- backend
|
||||
deploy:
|
||||
labels:
|
||||
- "traefik.enable=false"
|
||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||
- "coop-cloud.${STACK_NAME}.version=0.11.0+v0.19.0"
|
||||
- "coop-cloud.${STACK_NAME}.version=0.13.0+v0.22.0"
|
||||
environment:
|
||||
<<: [ *common-env ]
|
||||
healthcheck:
|
||||
@@ -116,7 +116,7 @@ services:
|
||||
|
||||
backend:
|
||||
user: ${DOCKER_USER:-1000}
|
||||
image: lasuite/drive-backend:v0.21.0
|
||||
image: lasuite/drive-backend:v0.22.0
|
||||
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.21.0
|
||||
image: lasuite/drive-backend:v0.22.0
|
||||
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.21.0
|
||||
image: lasuite/drive-backend:v0.22.0
|
||||
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.1
|
||||
image: redis:8.10.2
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
@@ -224,12 +224,12 @@ services:
|
||||
- backend
|
||||
|
||||
mailcatcher:
|
||||
image: sj26/mailcatcher:v0.10.0
|
||||
image: sj26/mailcatcher:v0.11.0
|
||||
networks:
|
||||
- backend
|
||||
|
||||
minio:
|
||||
image: minio/minio:RELEASE.2025-09-07T16-13-09Z
|
||||
image: quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z
|
||||
environment: *minio-env
|
||||
healthcheck:
|
||||
test: ["CMD", "mc", "ready", "local"]
|
||||
@@ -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"
|
||||
@@ -350,7 +347,7 @@ services:
|
||||
|
||||
|
||||
web:
|
||||
image: nginx:1.31.4
|
||||
image: nginx:1.31.6
|
||||
configs:
|
||||
- source: nginx_conf
|
||||
target: /etc/nginx/conf.d/default.conf
|
||||
@@ -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