From b649b59b01f9ef786462fafbb1d612ea136710bd Mon Sep 17 00:00:00 2001
From: notplants <mfowler.email@protonmail.com>
Date: Tue, 30 Dec 2025 16:41:24 -0500
Subject: [PATCH] struggling with collabora integration

---
 compose.yml | 50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/compose.yml b/compose.yml
index 9b8a370..2f1456b 100644
--- a/compose.yml
+++ b/compose.yml
@@ -61,7 +61,7 @@ x-common-env: &common-env
 
   # WOPI
   WOPI_CLIENTS: "collabora,onlyoffice"
-  WOPI_COLLABORA_DISCOVERY_URL: "http://collabora:9980/hosting/discovery"
+  WOPI_COLLABORA_DISCOVERY_URL: "https://collabora.lasuite-drive.cctest.autonomic.zone/hosting/discovery"
   WOPI_ONLYOFFICE_DISCOVERY_URL: "http://onlyoffice/hosting/discovery"
   WOPI_SRC_BASE_URL: "http://backend:8000"
 
@@ -106,7 +106,8 @@ services:
 
   backend:
     user: ${DOCKER_USER:-1000}
-    image: lasuite/drive-backend:v0.10.1
+#    image: lasuite/drive-backend:v0.10.1
+    image: lasuite/drive-backend:main
     command: [ "gunicorn", "-c", "/usr/local/etc/gunicorn/drive.py", "drive.wsgi:application" ]
     entrypoint: [ "/abra-entrypoint.sh", "/usr/local/bin/entrypoint" ]
     environment:
@@ -234,18 +235,18 @@ services:
       labels:
         - "traefik.enable=true"
         - "traefik.docker.network=proxy"
-        - "traefik.http.routers.minio.rule=Host(`${MINIO_DOMAIN}`)"
-        - "traefik.http.routers.minio.entrypoints=web-secure"
-        - "traefik.http.routers.minio.tls=true"
-        - "traefik.http.routers.minio.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "traefik.http.services.minio.loadbalancer.server.port=9000"
-        - "traefik.http.middlewares.minio-cors.headers.accessControlAllowOriginList=https://${DOMAIN}"
-        - "traefik.http.middlewares.minio-cors.headers.accessControlAllowMethods=GET,POST,PUT,DELETE,OPTIONS"
-        - "traefik.http.middlewares.minio-cors.headers.accessControlAllowHeaders=*"
-        - "traefik.http.middlewares.minio-cors.headers.accessControlExposeHeaders=ETag,Content-Length"
-        - "traefik.http.middlewares.minio-cors.headers.accessControlMaxAge=600"
-        - "traefik.http.middlewares.minio-cors.headers.addVaryHeader=true"
-        - "traefik.http.routers.minio.middlewares=minio-cors"
+        - "traefik.http.routers.${STACK_NAME}_minio.rule=Host(`${MINIO_DOMAIN}`)"
+        - "traefik.http.routers.${STACK_NAME}_minio.entrypoints=web-secure"
+        - "traefik.http.routers.${STACK_NAME}_minio.tls=true"
+        - "traefik.http.routers.${STACK_NAME}_minio.tls.certresolver=${LETS_ENCRYPT_ENV}"
+        - "traefik.http.services.${STACK_NAME}_minio.loadbalancer.server.port=9000"
+        - "traefik.http.middlewares.${STACK_NAME}_minio-cors.headers.accessControlAllowOriginList=https://${DOMAIN}"
+        - "traefik.http.middlewares.${STACK_NAME}_minio-cors.headers.accessControlAllowMethods=GET,POST,PUT,DELETE,OPTIONS"
+        - "traefik.http.middlewares.${STACK_NAME}_minio-cors.headers.accessControlAllowHeaders=*"
+        - "traefik.http.middlewares.${STACK_NAME}_minio-cors.headers.accessControlExposeHeaders=ETag,Content-Length"
+        - "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"
 
   collabora:
     image: collabora/code:latest
@@ -257,14 +258,31 @@ services:
 #      timeout: 10s
     networks:
       - backend
+      - proxy
 #    ports:
 #      - "9980:9980"
     environment:
       - extra_params=--o:ssl.enable=false
       - username=drive
       - password=password
-      - server_name=localhost:9980
-      - aliasgroup1=app-dev:8000
+      - server_name=collabora.lasuite-drive.cctest.autonomic.zone
+      - aliasgroup1=backend:8000
+    deploy:
+      labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=proxy"
+      - "traefik.http.routers.${STACK_NAME}_collabora.rule=Host(`collabora.lasuite-drive.cctest.autonomic.zone`)"
+      - "traefik.http.routers.${STACK_NAME}_collabora.entrypoints=web-secure"
+      - "traefik.http.routers.${STACK_NAME}_collabora.tls=true"
+      - "traefik.http.routers.${STACK_NAME}_collabora.tls.certresolver=${LETS_ENCRYPT_ENV}"
+      - "traefik.http.services.${STACK_NAME}_collabora.loadbalancer.server.port=9980"
+      - "traefik.http.middlewares.${STACK_NAME}_collabora-cors.headers.accessControlAllowOriginList=https://${DOMAIN}"
+      - "traefik.http.middlewares.${STACK_NAME}_collabora-cors.headers.accessControlAllowMethods=GET,POST,PUT,DELETE,OPTIONS"
+      - "traefik.http.middlewares.${STACK_NAME}_collabora-cors.headers.accessControlAllowHeaders=*"
+      - "traefik.http.middlewares.${STACK_NAME}_collabora-cors.headers.accessControlExposeHeaders=ETag,Content-Length"
+      - "traefik.http.middlewares.${STACK_NAME}_collabora-cors.headers.accessControlMaxAge=600"
+      - "traefik.http.middlewares.${STACK_NAME}_collabora-cors.headers.addVaryHeader=true"
+      - "traefik.http.routers.${STACK_NAME}_collabora.middlewares=${STACK_NAME}_collabora-cors"
 
 
   onlyoffice: