From f0585179c3ad8611539f69d93a22b72399a40a52 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Tue, 27 May 2025 17:01:45 +0200
Subject: [PATCH] chore: publish 3.3.0+24.04.13.3.1 release

---
 abra.sh         |  2 +-
 compose.yml     | 22 +++++++++++++---------
 nginx.conf.tmpl |  7 ++++++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/abra.sh b/abra.sh
index 895aa1e..bf90b1a 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,2 +1,2 @@
-export NGINX_CONF_VERSION=v2
+export NGINX_CONF_VERSION=v3
 export COOLWSD_XML_VERSION=v2
diff --git a/compose.yml b/compose.yml
index b6136a5..f65fc2a 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   web:
-    image: "nginx:1.27.4"
+    image: "nginx:1.28.0"
     environment:
       - STACK_NAME
       - DOMAIN=${DOMAIN}
@@ -23,24 +23,28 @@ services:
         - "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']
+      test:
+        [
+          "CMD-SHELL",
+          "curl -s -N localhost/hosting/capabilities |  grep Collabora",
+        ]
       interval: 30s
       timeout: 10s
       retries: 10
       start_period: 5m
 
   app:
-    image: "collabora/code:24.04.12.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
+      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
@@ -56,7 +60,7 @@ services:
       - internal
     deploy:
       labels:
-        - "coop-cloud.${STACK_NAME}.version=3.2.0+24.04.12.3.1"
+        - "coop-cloud.${STACK_NAME}.version=3.3.0+24.04.13.3.1"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 
 networks:
diff --git a/nginx.conf.tmpl b/nginx.conf.tmpl
index 29adf55..e6e9625 100644
--- a/nginx.conf.tmpl
+++ b/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 {