forked from coop-cloud/collabora
Compare commits
12 Commits
main
...
add-timeou
Author | SHA1 | Date | |
---|---|---|---|
f37ad1cb0a
|
|||
147921f5a3 | |||
8b0f869617 | |||
4836ca91df | |||
670ecd7bb1 | |||
7d8b30301e | |||
bced1c5993 | |||
86b36e6208 | |||
cedf401c57 | |||
835bd6613b | |||
d52e12925a | |||
e6607f4801 |
@ -35,7 +35,7 @@ steps:
|
|||||||
from_secret: drone_abra-bot_token
|
from_secret: drone_abra-bot_token
|
||||||
fork: true
|
fork: true
|
||||||
repositories:
|
repositories:
|
||||||
- coop-cloud/auto-recipes-catalogue-json
|
- toolshed/auto-recipes-catalogue-json
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event: tag
|
event: tag
|
||||||
|
@ -22,6 +22,10 @@
|
|||||||
your Docker swarm box
|
your Docker swarm box
|
||||||
1. `abra app deploy YOURAPPDOMAIN`
|
1. `abra app deploy YOURAPPDOMAIN`
|
||||||
|
|
||||||
|
Admin Interface:
|
||||||
|
|
||||||
|
`https://YOURAPPDOMAIN/browser/dist/admin/admin.html`
|
||||||
|
|
||||||
## Acknowledgements
|
## Acknowledgements
|
||||||
|
|
||||||
Config'd with thanks to [the people behind this article](https://geek-cookbook.funkypenguin.co.nz/recipes/collabora-online/).
|
Config'd with thanks to [the people behind this article](https://geek-cookbook.funkypenguin.co.nz/recipes/collabora-online/).
|
||||||
|
19
compose.yml
19
compose.yml
@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: "nginx:1.24.0"
|
image: "nginx:1.27.4"
|
||||||
environment:
|
environment:
|
||||||
- STACK_NAME
|
- STACK_NAME
|
||||||
- DOMAIN=${DOMAIN}
|
- DOMAIN=${DOMAIN}
|
||||||
@ -22,13 +22,25 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
|
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
|
||||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "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:
|
app:
|
||||||
image: "collabora/code:22.05.14.3.1"
|
image: "collabora/code:24.04.12.3.1"
|
||||||
cap_add:
|
cap_add:
|
||||||
- MKNOD
|
- MKNOD
|
||||||
secrets:
|
secrets:
|
||||||
- admin_password
|
- admin_password
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "curl", "-f", "http://localhost:9980"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 10
|
||||||
|
start_period: 2m
|
||||||
configs:
|
configs:
|
||||||
- source: coolwsd_xml
|
- source: coolwsd_xml
|
||||||
target: /etc/coolwsd/coolwsd.xml
|
target: /etc/coolwsd/coolwsd.xml
|
||||||
@ -44,7 +56,8 @@ services:
|
|||||||
- internal
|
- internal
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=2.3.0+22.05.14.3.1"
|
- "coop-cloud.${STACK_NAME}.version=3.2.0+24.04.12.3.1"
|
||||||
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
|
Reference in New Issue
Block a user