Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
64b8de4bb9 | ||
|
|
728238e016 | ||
|
|
93c9d1a9b0 | ||
|
|
5a38a20c44 | ||
|
|
1ed910dfb0 | ||
|
|
ce5308c7f5 |
+5
-4
@@ -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
|
||||||
|
|||||||
+13
-19
@@ -95,7 +95,7 @@ services:
|
|||||||
|
|
||||||
app:
|
app:
|
||||||
user: "${DOCKER_USER:-1000}"
|
user: "${DOCKER_USER:-1000}"
|
||||||
image: lasuite/drive-frontend:v0.25.0
|
image: lasuite/drive-frontend:v0.26.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
deploy:
|
deploy:
|
||||||
@@ -116,7 +116,7 @@ services:
|
|||||||
|
|
||||||
backend:
|
backend:
|
||||||
user: ${DOCKER_USER:-1000}
|
user: ${DOCKER_USER:-1000}
|
||||||
image: lasuite/drive-backend:v0.25.0
|
image: lasuite/drive-backend:v0.26.0
|
||||||
command: [ "gunicorn", "-c", "/usr/local/etc/gunicorn/drive.py", "drive.wsgi:application" ]
|
command: [ "gunicorn", "-c", "/usr/local/etc/gunicorn/drive.py", "drive.wsgi:application" ]
|
||||||
entrypoint: >
|
entrypoint: >
|
||||||
sh -c "if [ \"$$AUTO_MIGRATIONS\" = \"true\" ]; then /migrate.sh; fi && exec /abra-entrypoint.sh /usr/local/bin/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:
|
celery:
|
||||||
user: ${DOCKER_USER:-1000}
|
user: ${DOCKER_USER:-1000}
|
||||||
image: lasuite/drive-backend:v0.25.0
|
image: lasuite/drive-backend:v0.26.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
command: [ "celery", "-A", "drive.celery_app", "worker", "-l", "INFO" ]
|
command: [ "celery", "-A", "drive.celery_app", "worker", "-l", "INFO" ]
|
||||||
@@ -167,7 +167,7 @@ services:
|
|||||||
|
|
||||||
celery-beat:
|
celery-beat:
|
||||||
user: ${DOCKER_USER:-1000}
|
user: ${DOCKER_USER:-1000}
|
||||||
image: lasuite/drive-backend:v0.25.0
|
image: lasuite/drive-backend:v0.26.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
command: [ "celery", "-A", "drive.celery_app", "beat", "-l", "INFO", "--schedule", "/tmp/celerybeat-schedule" ]
|
command: [ "celery", "-A", "drive.celery_app", "beat", "-l", "INFO", "--schedule", "/tmp/celerybeat-schedule" ]
|
||||||
@@ -214,7 +214,7 @@ services:
|
|||||||
- postgres_p
|
- postgres_p
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:8.10.2
|
image: redis:8.10.3
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "redis-cli", "ping"]
|
test: ["CMD", "redis-cli", "ping"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
@@ -274,13 +274,12 @@ services:
|
|||||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||||
|
|
||||||
collabora:
|
collabora:
|
||||||
image: collabora/code:26.04.5.1.1
|
image: collabora/code:26.04.5.2.1
|
||||||
entrypoint: >
|
# 26.04 images exec coolwsd directly (no shell in the image), so ssl options are passed as
|
||||||
sh -c "
|
# args and the panel password comes from the env instead of a Docker secret.
|
||||||
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
|
||||||
@@ -289,11 +288,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"
|
||||||
@@ -312,7 +309,7 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}_collabora.middlewares=${STACK_NAME}_collabora-cors"
|
- "traefik.http.routers.${STACK_NAME}_collabora.middlewares=${STACK_NAME}_collabora-cors"
|
||||||
|
|
||||||
onlyoffice:
|
onlyoffice:
|
||||||
image: onlyoffice/documentserver-de:10.0.0.1
|
image: onlyoffice/documentserver-de:10.0.2.1
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "curl", "-f", "http://localhost/hosting/discovery" ]
|
test: [ "CMD", "curl", "-f", "http://localhost/hosting/discovery" ]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
@@ -351,7 +348,7 @@ services:
|
|||||||
|
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: nginx:1.31.7
|
image: nginx:1.31.8
|
||||||
configs:
|
configs:
|
||||||
- source: nginx_conf
|
- source: nginx_conf
|
||||||
target: /etc/nginx/conf.d/default.conf
|
target: /etc/nginx/conf.d/default.conf
|
||||||
@@ -423,9 +420,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}
|
||||||
Reference in New Issue
Block a user