17 Commits

Author SHA1 Message Date
f0585179c3 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
2025-05-27 17:41:03 +02:00
98a2df9963 Merge pull request 'fix: add timeout' (#4) from add-timeout into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #4
2025-04-19 08:09:17 +00:00
f37ad1cb0a fix: add timeout
Some checks failed
continuous-integration/drone/pr Build is failing
2025-04-19 09:41:32 +02:00
3wc
147921f5a3 chore: publish 3.2.0+24.04.12.3.1 release
All checks were successful
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
2025-02-14 13:54:59 -05:00
8b0f869617 Update .drone.yml
Some checks failed
continuous-integration/drone/push Build is failing
2025-01-08 10:09:12 -08:00
4836ca91df chore: publish 3.1.0+24.04.10.2.1 release
All checks were successful
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
2024-12-10 18:37:40 +01:00
670ecd7bb1 chore: publish 3.0.0+24.04.6.1.1 release
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-07 15:02:34 +02:00
7d8b30301e update README
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-28 18:45:41 +02:00
3wc
bced1c5993 chore: publish 2.7.1+23.05.10.1.1 release
All checks were successful
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
2024-04-03 11:17:49 -03:00
86b36e6208 chore: publish 2.7.0+23.05.8.2.1 release
All checks were successful
continuous-integration/drone/push Build is passing
2024-02-16 16:31:20 +01:00
3wc
cedf401c57 chore: publish 2.6.0+23.05.5.4.1 release
All checks were successful
continuous-integration/drone/push Build is passing
2023-11-13 12:59:02 +00:00
835bd6613b chore: publish 2.5.0+23.05.3.1.1 release
All checks were successful
continuous-integration/drone/push Build is passing
2023-09-04 13:24:51 +02:00
d52e12925a chore: publish 2.4.0+23.05.2.2.1 release
All checks were successful
continuous-integration/drone/push Build is passing
2023-08-24 10:37:58 +02:00
e6607f4801 Merge pull request 'PR: Collabora up to 22.05.14.3.1 and Nginx 1.24.0' (#2) from javielico/collabora:main into main
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
Reviewed-on: #2
2023-05-29 15:23:34 +00:00
73d3cbd42f Adding release notes back
Some checks failed
continuous-integration/drone/pr Build is failing
2023-05-29 16:06:53 +01:00
ad59bedf8d Up version to latest stable 22.05.14.3.1 and nginx to 1.24.0
Some checks failed
continuous-integration/drone/pr Build is failing
2023-05-08 20:43:05 +01:00
da1835a3a6 Merge pull request 'main' (#1) from coop-cloud/collabora:main into main
Reviewed-on: javielico/collabora#1
2023-05-08 19:35:32 +00:00
5 changed files with 32 additions and 6 deletions

View File

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

View File

@ -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/).

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.23.3"
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.10.1.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.2.0+22.05.10.1.1"
- "coop-cloud.${STACK_NAME}.version=3.3.0+24.04.13.3.1"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
networks:
proxy:

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 {