bump to 0.5.0+v0.12.0

compose.yml

@@ -66,6 +66,11 @@ 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
@@ -94,7 +99,7 @@ services:
       labels:
         - "traefik.enable=false"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
-        - "coop-cloud.${STACK_NAME}.version=0.4.0+v0.12.0"
+        - "coop-cloud.${STACK_NAME}.version=0.5.0+v0.12.0"
     environment:
       <<: [ *common-env ]
     healthcheck:
@@ -130,26 +135,19 @@ 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.12.0
+  celery:
     user: ${DOCKER_USER:-1000}
+    image: lasuite/drive-backend:v0.12.0
     networks:
       - backend
-    depends_on:
-      - db
-      - redis
+    command: [ "celery", "-A", "drive.celery_app", "worker", "-l", "INFO" ]
+    entrypoint: ["/abra-entrypoint.sh", "/usr/local/bin/entrypoint"]
     environment:
-      <<: [ *common-env, *postgres-env ]
+      <<: [*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
@@ -158,12 +156,12 @@ services:
       - postgres_p
       - email_pass
 
-  celery:
+  celery-beat:
     user: ${DOCKER_USER:-1000}
     image: lasuite/drive-backend:v0.12.0
     networks:
       - backend
-    command: [ "celery", "-A", "drive.celery_app", "worker", "-l", "INFO" ]
+    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]
@@ -389,10 +387,6 @@ 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