4 Commits

Author SHA1 Message Date
f4135d7820 bump to 0.8.0+v0.18.0
- drive-frontend/backend: v0.12.0 → v0.18.0
- collabora/code: 25.04.9.1.1 → 25.04.9.4.1
- onlyoffice/documentserver-de: 9.2 → 9.3.1.2
- redis: 8 → 8.6.3 (pinned)
- nginx: 1.29 → 1.30.0
- add optional env vars: DJANGO_EMAIL_URL_APP, DJANGO_CSRF_TRUSTED_ORIGINS, DATA_UPLOAD_MAX_MEMORY_SIZE
2026-05-11 19:52:46 +00:00
016728f970 Merge pull request '0.7.1v0.12.0' (#4) from 0.7.1v0.12.0 into main
Reviewed-on: https://git.coopcloud.tech/coop-cloud/lasuite-drive/pulls/4
2026-02-20 14:22:44 +00:00
9c4a1f823c bump to 0.7.1+v0.12.0 2026-02-20 14:20:07 +00:00
0411553e36 add minio backup label and fix pg restore path 2026-02-20 14:19:59 +00:00
4 changed files with 21 additions and 11 deletions

View File

@ -75,6 +75,12 @@ 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
##############################################################################

View File

@ -3,7 +3,7 @@
export ABRA_ENTRYPOINT_VERSION=v11
export NGINX_CONF_VERSION=v6
export ONLYOFFICE_CONF_VERSION=v2
export PG_BACKUP_VERSION=v3
export PG_BACKUP_VERSION=v4
environment() {
# this exports all the secrets as environment variables

View File

@ -27,6 +27,9 @@ 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
@ -92,14 +95,14 @@ services:
app:
user: "${DOCKER_USER:-1000}"
image: lasuite/drive-frontend:v0.12.0
image: lasuite/drive-frontend:v0.18.0
networks:
- backend
deploy:
labels:
- "traefik.enable=false"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "coop-cloud.${STACK_NAME}.version=0.7.0+v0.12.0"
- "coop-cloud.${STACK_NAME}.version=0.8.0+v0.18.0"
environment:
<<: [ *common-env ]
healthcheck:
@ -113,7 +116,7 @@ services:
backend:
user: ${DOCKER_USER:-1000}
image: lasuite/drive-backend:v0.12.0
image: lasuite/drive-backend:v0.18.0
command: [ "gunicorn", "-c", "/usr/local/etc/gunicorn/drive.py", "drive.wsgi:application" ]
entrypoint: [ "/abra-entrypoint.sh", "/usr/local/bin/entrypoint" ]
environment:
@ -137,7 +140,7 @@ services:
celery:
user: ${DOCKER_USER:-1000}
image: lasuite/drive-backend:v0.12.0
image: lasuite/drive-backend:v0.18.0
networks:
- backend
command: [ "celery", "-A", "drive.celery_app", "worker", "-l", "INFO" ]
@ -159,7 +162,7 @@ services:
celery-beat:
user: ${DOCKER_USER:-1000}
image: lasuite/drive-backend:v0.12.0
image: lasuite/drive-backend:v0.18.0
networks:
- backend
command: [ "celery", "-A", "drive.celery_app", "beat", "-l", "INFO", "--schedule", "/tmp/celerybeat-schedule" ]
@ -206,7 +209,7 @@ services:
- postgres_p
redis:
image: redis:8
image: redis:8.6.3
healthcheck:
test: ["CMD", "redis-cli", "ping"]
interval: 10s
@ -280,9 +283,10 @@ 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.1.1
image: collabora/code:25.04.9.4.1
entrypoint: >
sh -c "
export password=\"$$(cat /run/secrets/collabora_p)\" &&
@ -320,7 +324,7 @@ services:
- "traefik.http.routers.${STACK_NAME}_collabora.middlewares=${STACK_NAME}_collabora-cors"
onlyoffice:
image: onlyoffice/documentserver-de:9.2
image: onlyoffice/documentserver-de:9.3.1.2
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost/hosting/discovery" ]
interval: 30s
@ -359,7 +363,7 @@ services:
web:
image: nginx:1.29
image: nginx:1.30.0
configs:
- source: nginx_conf
target: /etc/nginx/conf.d/default.conf

View File

@ -10,7 +10,7 @@ function backup {
}
function restore {
cd /var/lib/postgresql/data/
cd /var/lib/postgresql/data/pgdata
restore_config(){
# Restore allowed connections
cat pg_hba.conf.bak > pg_hba.conf