diff --git a/abra.sh b/abra.sh index ad1496b..72ddd1a 100755 --- a/abra.sh +++ b/abra.sh @@ -5,7 +5,7 @@ export NGINX_CONF_VERSION=v6 export ONLYOFFICE_CONF_VERSION=v2 export PG_BACKUP_VERSION=v4 export MIGRATE_VERSION=v1 -export MINIO_INITIALIZE_VERSION=v1 +export MINIO_INITIALIZE_VERSION=v2 environment() { # this exports all the secrets as environment variables diff --git a/compose.yml b/compose.yml index 494f32c..4912cb8 100644 --- a/compose.yml +++ b/compose.yml @@ -95,14 +95,14 @@ services: app: user: "${DOCKER_USER:-1000}" - image: lasuite/drive-frontend:v0.22.0 + image: lasuite/drive-frontend:v0.23.0 networks: - backend deploy: labels: - "traefik.enable=false" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - - "coop-cloud.${STACK_NAME}.version=0.13.0+v0.22.0" + - "coop-cloud.${STACK_NAME}.version=0.13.2+v0.22.0" environment: <<: [ *common-env ] healthcheck: @@ -116,7 +116,7 @@ services: backend: user: ${DOCKER_USER:-1000} - image: lasuite/drive-backend:v0.22.0 + image: lasuite/drive-backend:v0.23.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.22.0 + image: lasuite/drive-backend:v0.23.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.22.0 + image: lasuite/drive-backend:v0.23.0 networks: - backend command: [ "celery", "-A", "drive.celery_app", "beat", "-l", "INFO", "--schedule", "/tmp/celerybeat-schedule" ] @@ -229,7 +229,8 @@ services: - backend minio: - image: quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z + image: bitnamilegacy/minio:2025.7.23-debian-12-r5 + user: root environment: *minio-env healthcheck: test: ["CMD", "mc", "ready", "local"] @@ -239,11 +240,11 @@ services: networks: - backend - proxy - command: minio server /data + command: /opt/bitnami/scripts/minio/run.sh entrypoint: > - sh -c "/minio-initialize.sh & exec /usr/bin/docker-entrypoint.sh \"$$@\"" -- + sh -c "/minio-initialize.sh & exec /opt/bitnami/scripts/minio/entrypoint.sh \"$$@\"" -- volumes: - - minio:/data + - minio:/bitnami/minio/data configs: - source: abra_entrypoint target: /abra-entrypoint.sh @@ -273,7 +274,7 @@ services: - "backupbot.backup=${ENABLE_BACKUPS:-true}" collabora: - image: collabora/code:26.04.4.1.1 + image: collabora/code:26.04.4.2.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"] diff --git a/minio-initialize.sh b/minio-initialize.sh index cb36278..d1242a6 100644 --- a/minio-initialize.sh +++ b/minio-initialize.sh @@ -1,6 +1,11 @@ #!/bin/sh set -e +# Use an isolated mc config dir: the bundled Bitnami image runs its own +# internal mc client (as the "minio" user) against the default /.mc path, +# which collides with this script running as root against the same path. +export MC_CONFIG_DIR=/tmp/mc-drive-init + # Wait for minio to be ready (up to 60 seconds) i=0 while ! mc ready local 2>/dev/null; do