Compare commits

...

6 Commits

Author SHA1 Message Date
renovate-bot 110cb9a024 Add renovate.json
continuous-integration/drone/pr Build is failing
2026-03-10 17:36:20 +00:00
javielico 82959954f8 Merge pull request 'chore update 4.0.1+25.04.9.1.1' (#7) from javielico/collabora:main into main
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is passing
Reviewed-on: #7
2026-02-22 16:23:57 +00:00
javielico 67caaee226 chore update 4.0.1+25.04.9.1.1
continuous-integration/drone/pr Build is failing
2026-02-22 16:23:04 +00:00
3wordchant ee997ba6f7 chore: publish 4.0.0+25.04.4.1.1 release
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
2025-07-23 18:10:45 +01:00
moritz f0585179c3 chore: publish 3.3.0+24.04.13.3.1 release
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
2025-05-27 17:41:03 +02:00
decentral1se 98a2df9963 Merge pull request 'fix: add timeout' (#4) from add-timeout into main
continuous-integration/drone/push Build is passing
Reviewed-on: #4
2025-04-19 08:09:17 +00:00
4 changed files with 26 additions and 11 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
export NGINX_CONF_VERSION=v2
export NGINX_CONF_VERSION=v3
export COOLWSD_XML_VERSION=v2
+13 -9
View File
@@ -3,7 +3,7 @@ version: "3.8"
services:
web:
image: "nginx:1.27.4"
image: "nginx:1.29.4"
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:25.04.9.1.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=4.0.1+25.04.9.1.1"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
networks:
+6 -1
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 {
+6
View File
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
]
}