chore: publish 3.3.0+24.04.13.3.1 release

Reviewed-on: coop-cloud/collabora#4

.drone.yml

@@ -35,7 +35,7 @@ steps:
         from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - coop-cloud/auto-recipes-catalogue-json
+        - toolshed/auto-recipes-catalogue-json
 
 trigger:
   event: tag

README.md

@@ -22,6 +22,10 @@
    your Docker swarm box
 1. `abra app deploy YOURAPPDOMAIN`
 
+Admin Interface:
+
+`https://YOURAPPDOMAIN/browser/dist/admin/admin.html`
+
 ## Acknowledgements
 
 Config'd with thanks to [the people behind this article](https://geek-cookbook.funkypenguin.co.nz/recipes/collabora-online/).

abra.sh

@@ -1,2 +1,2 @@
-export NGINX_CONF_VERSION=v2
+export NGINX_CONF_VERSION=v3
 export COOLWSD_XML_VERSION=v2

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   web:
-    image: "nginx:1.24.0"
+    image: "nginx:1.28.0"
     environment:
       - STACK_NAME
       - DOMAIN=${DOMAIN}
@@ -22,13 +22,29 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "curl -s -N localhost/hosting/capabilities |  grep Collabora",
+        ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 5m
 
   app:
-    image: "collabora/code:22.05.14.3.1"
+    image: "collabora/code:24.04.13.3.1"
     cap_add:
       - MKNOD
     secrets:
       - admin_password
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9980"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 2m
     configs:
       - source: coolwsd_xml
         target: /etc/coolwsd/coolwsd.xml
@@ -44,7 +60,8 @@ services:
       - internal
     deploy:
       labels:
-        - "coop-cloud.${STACK_NAME}.version=2.3.0+22.05.14.3.1"
+        - "coop-cloud.${STACK_NAME}.version=3.3.0+24.04.13.3.1"
+        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 
 networks:
   proxy:

nginx.conf.tmpl

@@ -5,8 +5,13 @@ events {
 }
 
 http {
+    resolver 127.0.0.11 valid=30s ipv6=off;
+    resolver_timeout 5s;
+
     upstream collabora-upstream {
-      server {{ env "STACK_NAME" }}_app:9980;
+      zone collabora-upstream 64k;
+      server {{ env "STACK_NAME" }}_app:9980 resolve;
+      keepalive 16;
     }
 
     server {