Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0c28fe47a5 |
@@ -75,12 +75,6 @@ LOGGING_LEVEL_LOGGERS_APP=INFO
|
||||
# Password is managed via Docker secret 'collabora_p'
|
||||
#COLLABORA_ADMIN_USERNAME=admin
|
||||
|
||||
##############################################################################
|
||||
# BACKUPS
|
||||
##############################################################################
|
||||
# Set to false to disable backup-bot labels (default: true)
|
||||
#ENABLE_BACKUPS=true
|
||||
|
||||
##############################################################################
|
||||
# WOPI SCHEDULING
|
||||
##############################################################################
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
export ABRA_ENTRYPOINT_VERSION=v11
|
||||
export NGINX_CONF_VERSION=v6
|
||||
export ONLYOFFICE_CONF_VERSION=v2
|
||||
export PG_BACKUP_VERSION=v4
|
||||
export PG_BACKUP_VERSION=v3
|
||||
|
||||
environment() {
|
||||
# this exports all the secrets as environment variables
|
||||
|
||||
+9
-13
@@ -27,9 +27,6 @@ x-common-env: &common-env
|
||||
DJANGO_EMAIL_USE_SSL:
|
||||
DJANGO_EMAIL_USE_TLS:
|
||||
DJANGO_EMAIL_FROM:
|
||||
DJANGO_EMAIL_URL_APP:
|
||||
DJANGO_CSRF_TRUSTED_ORIGINS:
|
||||
DATA_UPLOAD_MAX_MEMORY_SIZE:
|
||||
# Backend url
|
||||
DRIVE_BASE_URL: "https://${DOMAIN}"
|
||||
# Media
|
||||
@@ -95,14 +92,14 @@ services:
|
||||
|
||||
app:
|
||||
user: "${DOCKER_USER:-1000}"
|
||||
image: lasuite/drive-frontend:v0.19.0
|
||||
image: lasuite/drive-frontend:v0.12.0
|
||||
networks:
|
||||
- backend
|
||||
deploy:
|
||||
labels:
|
||||
- "traefik.enable=false"
|
||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||
- "coop-cloud.${STACK_NAME}.version=0.10.0+v0.19.0"
|
||||
- "coop-cloud.${STACK_NAME}.version=0.2.7+v0.11.1"
|
||||
environment:
|
||||
<<: [ *common-env ]
|
||||
healthcheck:
|
||||
@@ -116,7 +113,7 @@ services:
|
||||
|
||||
backend:
|
||||
user: ${DOCKER_USER:-1000}
|
||||
image: lasuite/drive-backend:v0.19.0
|
||||
image: lasuite/drive-backend:v0.12.0
|
||||
command: [ "gunicorn", "-c", "/usr/local/etc/gunicorn/drive.py", "drive.wsgi:application" ]
|
||||
entrypoint: [ "/abra-entrypoint.sh", "/usr/local/bin/entrypoint" ]
|
||||
environment:
|
||||
@@ -140,7 +137,7 @@ services:
|
||||
|
||||
celery:
|
||||
user: ${DOCKER_USER:-1000}
|
||||
image: lasuite/drive-backend:v0.19.0
|
||||
image: lasuite/drive-backend:v0.12.0
|
||||
networks:
|
||||
- backend
|
||||
command: [ "celery", "-A", "drive.celery_app", "worker", "-l", "INFO" ]
|
||||
@@ -162,7 +159,7 @@ services:
|
||||
|
||||
celery-beat:
|
||||
user: ${DOCKER_USER:-1000}
|
||||
image: lasuite/drive-backend:v0.19.0
|
||||
image: lasuite/drive-backend:v0.12.0
|
||||
networks:
|
||||
- backend
|
||||
command: [ "celery", "-A", "drive.celery_app", "beat", "-l", "INFO", "--schedule", "/tmp/celerybeat-schedule" ]
|
||||
@@ -209,7 +206,7 @@ services:
|
||||
- postgres_p
|
||||
|
||||
redis:
|
||||
image: redis:8.8.0
|
||||
image: redis:8
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
@@ -283,10 +280,9 @@ services:
|
||||
- "traefik.http.middlewares.${STACK_NAME}_minio-cors.headers.accessControlMaxAge=600"
|
||||
- "traefik.http.middlewares.${STACK_NAME}_minio-cors.headers.addVaryHeader=true"
|
||||
- "traefik.http.routers.${STACK_NAME}_minio.middlewares=${STACK_NAME}_minio-cors"
|
||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||
|
||||
collabora:
|
||||
image: collabora/code:25.04.9.4.1
|
||||
image: collabora/code:25.04.9.1.1
|
||||
entrypoint: >
|
||||
sh -c "
|
||||
export password=\"$$(cat /run/secrets/collabora_p)\" &&
|
||||
@@ -324,7 +320,7 @@ services:
|
||||
- "traefik.http.routers.${STACK_NAME}_collabora.middlewares=${STACK_NAME}_collabora-cors"
|
||||
|
||||
onlyoffice:
|
||||
image: onlyoffice/documentserver-de:9.3.1.2
|
||||
image: onlyoffice/documentserver-de:9.2
|
||||
healthcheck:
|
||||
test: [ "CMD", "curl", "-f", "http://localhost/hosting/discovery" ]
|
||||
interval: 30s
|
||||
@@ -363,7 +359,7 @@ services:
|
||||
|
||||
|
||||
web:
|
||||
image: nginx:1.31.2
|
||||
image: nginx:1.29
|
||||
configs:
|
||||
- source: nginx_conf
|
||||
target: /etc/nginx/conf.d/default.conf
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ function backup {
|
||||
}
|
||||
|
||||
function restore {
|
||||
cd /var/lib/postgresql/data/pgdata
|
||||
cd /var/lib/postgresql/data/
|
||||
restore_config(){
|
||||
# Restore allowed connections
|
||||
cat pg_hba.conf.bak > pg_hba.conf
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
After upgrading, you must generate the new secret for collabora to work:
|
||||
|
||||
```
|
||||
abra app secret generate <app-domain> collabora_p v1
|
||||
abra app config <app-domain> # set SECRET_COLLABORA_P_VERSION=v1
|
||||
abra app secret generate <app-name> collabora_p
|
||||
abra app config <app-name> # set SECRET_COLLABORA_P_VERSION=v1
|
||||
```
|
||||
|
||||
|
||||
Reference in New Issue
Block a user