chore: publish 3.3.0+24.04.13.3.1 release
All checks were successful
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing

This commit is contained in:
Moritz 2025-05-27 17:01:45 +02:00
parent 98a2df9963
commit f0585179c3
Signed by: moritz
GPG Key ID: 1020A035E5DD0824
3 changed files with 20 additions and 11 deletions

View File

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

View File

@ -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:

View File

@ -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 {