Compare commits

..

No commits in common. "main" and "add-timeout" have entirely different histories.

3 changed files with 11 additions and 20 deletions

View File

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

View File

@ -3,7 +3,7 @@ version: "3.8"
services:
web:
image: "nginx:1.28.0"
image: "nginx:1.27.4"
environment:
- STACK_NAME
- DOMAIN=${DOMAIN}
@ -23,18 +23,14 @@ 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.13.3.1"
image: "collabora/code:24.04.12.3.1"
cap_add:
- MKNOD
secrets:
@ -60,7 +56,7 @@ services:
- internal
deploy:
labels:
- "coop-cloud.${STACK_NAME}.version=3.3.0+24.04.13.3.1"
- "coop-cloud.${STACK_NAME}.version=3.2.0+24.04.12.3.1"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
networks:

View File

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