chore: publish 0.2.7+v0.11.1 release

.env.sample

@@ -65,12 +65,3 @@ OIDC_AUTH_REQUEST_EXTRA_PARAMS='{"acr_values": "eidas1"}'
 LOGGING_LEVEL_HANDLERS_CONSOLE=INFO
 LOGGING_LEVEL_LOGGERS_ROOT=INFO
 LOGGING_LEVEL_LOGGERS_APP=INFO
-
-##############################################################################
-# WOPI SCHEDULING
-##############################################################################
-# Celery Beat crontab for the WOPI configuration task (default: daily at 3:00 AM)
-#WOPI_CONFIGURATION_CRONTAB_MINUTE=0
-#WOPI_CONFIGURATION_CRONTAB_HOUR=3
-#WOPI_CONFIGURATION_CRONTAB_DAY_OF_MONTH=*
-#WOPI_CONFIGURATION_CRONTAB_MONTH_OF_YEAR=*

abra.sh

@@ -4,6 +4,7 @@ export ABRA_ENTRYPOINT_VERSION=v5
 export NGINX_CONF_VERSION=v6
 export ONLYOFFICE_CONF_VERSION=v2
 export PG_BACKUP_VERSION=v3
+export SCHEDULE_WOPI_VERSION=v1
 
 environment() {
   # this exports all the secrets as environment variables

compose.yml

@@ -66,11 +66,6 @@ x-common-env: &common-env
   WOPI_COLLABORA_DISCOVERY_URL: "https://${COLLABORA_DOMAIN}/hosting/discovery"
   WOPI_ONLYOFFICE_DISCOVERY_URL: "https://${ONLY_OFFICE_DOMAIN}/hosting/discovery"
   WOPI_SRC_BASE_URL: "https://${DOMAIN}"
-  # WOPI scheduling (Celery Beat crontab for WOPI configuration task)
-  WOPI_CONFIGURATION_CRONTAB_MINUTE: ${WOPI_CONFIGURATION_CRONTAB_MINUTE:-0}
-  WOPI_CONFIGURATION_CRONTAB_HOUR: ${WOPI_CONFIGURATION_CRONTAB_HOUR:-3}
-  WOPI_CONFIGURATION_CRONTAB_DAY_OF_MONTH: ${WOPI_CONFIGURATION_CRONTAB_DAY_OF_MONTH:-*}
-  WOPI_CONFIGURATION_CRONTAB_MONTH_OF_YEAR: ${WOPI_CONFIGURATION_CRONTAB_MONTH_OF_YEAR:-*}
 
 x-postgres-env: &postgres-env
   # Postgresql db container configuration
@@ -92,14 +87,14 @@ services:
 
   app:
     user: "${DOCKER_USER:-1000}"
-    image: lasuite/drive-frontend:v0.12.0
+    image: lasuite/drive-frontend:v0.11.1
     networks:
       - backend
     deploy:
       labels:
         - "traefik.enable=false"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
-        - "coop-cloud.${STACK_NAME}.version=0.5.0+v0.12.0"
+        - "coop-cloud.${STACK_NAME}.version=0.2.7+v0.11.1"
     environment:
       <<: [ *common-env ]
     healthcheck:
@@ -113,7 +108,7 @@ services:
 
   backend:
     user: ${DOCKER_USER:-1000}
-    image: lasuite/drive-backend:v0.12.0
+    image: lasuite/drive-backend:v0.11.1
     command: [ "gunicorn", "-c", "/usr/local/etc/gunicorn/drive.py", "drive.wsgi:application" ]
     entrypoint: [ "/abra-entrypoint.sh", "/usr/local/bin/entrypoint" ]
     environment:
@@ -135,9 +130,37 @@ services:
       - postgres_p
       - email_pass
 
+  # this may be unecessary once the PR is merged to use celery beat
+  # but this is a workaround for now https://github.com/suitenumerique/drive/issues/484
+  scheduler:
+    image: lasuite/drive-backend:v0.11.1
+    user: ${DOCKER_USER:-1000}
+    networks:
+      - backend
+    depends_on:
+      - db
+      - redis
+    environment:
+      <<: [ *common-env, *postgres-env ]
+    configs:
+      - source: schedule_wopi
+        target: /app/schedule_wopi.sh
+        mode: 0755
+      - source: abra_entrypoint
+        target: /abra-entrypoint.sh
+        mode: 0555
+    entrypoint: ["/app/schedule_wopi.sh"]
+    secrets:
+      - django_sk
+      - django_sp
+      - oidc_rpcs
+      - minio_rp
+      - postgres_p
+      - email_pass
+
   celery:
     user: ${DOCKER_USER:-1000}
-    image: lasuite/drive-backend:v0.12.0
+    image: lasuite/drive-backend:v0.11.1
     networks:
       - backend
     command: [ "celery", "-A", "drive.celery_app", "worker", "-l", "INFO" ]
@@ -156,39 +179,18 @@ services:
       - postgres_p
       - email_pass
 
-  celery-beat:
-    user: ${DOCKER_USER:-1000}
-    image: lasuite/drive-backend:v0.12.0
-    networks:
-      - backend
-    command: [ "celery", "-A", "drive.celery_app", "beat", "-l", "INFO", "--schedule", "/tmp/celerybeat-schedule" ]
-    entrypoint: ["/abra-entrypoint.sh", "/usr/local/bin/entrypoint"]
-    environment:
-      <<: [*common-env, *postgres-env]
-    configs:
-      - source: abra_entrypoint
-        target: /abra-entrypoint.sh
-        mode: 0555
-    secrets:
-      - django_sk
-      - django_sp
-      - oidc_rpcs
-      - minio_rp
-      - postgres_p
-      - email_pass
-
   db:
-    image: pgautoupgrade/pgautoupgrade:18-debian
+    image: postgres:16
     networks:
       - backend 
     healthcheck:
-      test: ["CMD", "pg_isready", "-q", "-U", "drive", "-d", "drive"]
+      test: ["CMD", "pg_isready", "-q", "-U", "docs", "-d", "docs"]
       interval: 1s
       timeout: 2s
       retries: 300
     environment:
       <<: *postgres-env
-      PGDATA: /var/lib/postgresql/data/pgdata
+      PGDATA: var/lib/postgresql/data/pgdata
     volumes:
       - postgres:/var/lib/postgresql/data/pgdata
     deploy:
@@ -205,7 +207,7 @@ services:
       - postgres_p
 
   redis:
-    image: redis:8
+    image: redis:5
     networks:
       - backend 
 
@@ -348,7 +350,7 @@ services:
 
 
   web:
-    image: nginx:1.29
+    image: nginx:1.25
     configs:
       - source: nginx_conf
         target: /etc/nginx/conf.d/default.conf
@@ -387,6 +389,10 @@ configs:
   pg_backup:
     name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
     file: pg_backup.sh
+  schedule_wopi:
+    name: ${STACK_NAME}_schedule_wopi_${SCHEDULE_WOPI_VERSION}
+    file: schedule_wopi.sh
+    template_driver: golang
   abra_entrypoint:
     name: ${STACK_NAME}_entrypoint_${ABRA_ENTRYPOINT_VERSION}
     file: abra-entrypoint.sh

release/0.3.0+v0.11.1

@@ -1 +0,0 @@
-Switched the database image from postgres:16 to pgautoupgrade/pgautoupgrade:18-debian. This enables automatic PostgreSQL major version upgrades. No action required from the operator — the upgrade from PostgreSQL 16 to 18 is handled automatically by the pgautoupgrade image on first start.

schedule_wopi.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+while true; do
+    echo "Running WOPI job at $(date)"
+    # source env
+    . /abra-entrypoint.sh -e
+    # run python command
+    python manage.py trigger_wopi_configuration
+    echo "++ completed wopi trigger. now sleeping."
+    # wait before next run
+    sleep 1800  # 1800 seconds = 30 minutes
+done