mirror of
https://github.com/opencloud-eu/opencloud-compose.git
synced 2026-06-08 20:20:04 +08:00
Compare commits
1 Commits
fix-collab
...
issue/165
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
537de1a843 |
@@ -23,10 +23,6 @@ add_arg "--entryPoints.https.address=:${TRAEFIK_PORT_HTTPS:-443}"
|
|||||||
add_arg "--entryPoints.https.transport.respondingTimeouts.readTimeout=12h"
|
add_arg "--entryPoints.https.transport.respondingTimeouts.readTimeout=12h"
|
||||||
add_arg "--entryPoints.https.transport.respondingTimeouts.writeTimeout=12h"
|
add_arg "--entryPoints.https.transport.respondingTimeouts.writeTimeout=12h"
|
||||||
add_arg "--entryPoints.https.transport.respondingTimeouts.idleTimeout=3m"
|
add_arg "--entryPoints.https.transport.respondingTimeouts.idleTimeout=3m"
|
||||||
# allow encoded characters required for WOPI/Collabora
|
|
||||||
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedSlash=true"
|
|
||||||
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedQuestionMark=true"
|
|
||||||
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedPercent=true"
|
|
||||||
# docker provider (get configuration from container labels)
|
# docker provider (get configuration from container labels)
|
||||||
add_arg "--providers.docker.endpoint=unix:///var/run/docker.sock"
|
add_arg "--providers.docker.endpoint=unix:///var/run/docker.sock"
|
||||||
add_arg "--providers.docker.exposedByDefault=false"
|
add_arg "--providers.docker.exposedByDefault=false"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ services:
|
|||||||
- "traefik.http.services.opencloud.loadbalancer.server.port=9200"
|
- "traefik.http.services.opencloud.loadbalancer.server.port=9200"
|
||||||
- "traefik.http.routers.opencloud.${TRAEFIK_SERVICES_TLS_CONFIG}"
|
- "traefik.http.routers.opencloud.${TRAEFIK_SERVICES_TLS_CONFIG}"
|
||||||
traefik:
|
traefik:
|
||||||
image: traefik:v3.6.4
|
image: traefik:v3
|
||||||
# release notes: https://github.com/traefik/traefik/releases
|
# release notes: https://github.com/traefik/traefik/releases
|
||||||
user: ${TRAEFIK_CONTAINER_UID_GID:-0:0}
|
user: ${TRAEFIK_CONTAINER_UID_GID:-0:0}
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@@ -61,16 +61,12 @@ services:
|
|||||||
--o:ssl.termination=true \
|
--o:ssl.termination=true \
|
||||||
--o:welcome.enable=false \
|
--o:welcome.enable=false \
|
||||||
--o:net.frame_ancestors=${OC_DOMAIN:-cloud.opencloud.test}${TRAEFIK_PORT_HTTPS:+:}${TRAEFIK_PORT_HTTPS:-} \
|
--o:net.frame_ancestors=${OC_DOMAIN:-cloud.opencloud.test}${TRAEFIK_PORT_HTTPS:+:}${TRAEFIK_PORT_HTTPS:-} \
|
||||||
--o:net.lok_allow.host[14]=${OC_DOMAIN-cloud.opencloud.test}${TRAEFIK_PORT_HTTPS:+:}${TRAEFIK_PORT_HTTPS:-} \
|
--o:net.lok_allow.host[14]=${OC_DOMAIN:-cloud.opencloud.test}${TRAEFIK_PORT_HTTPS:+:}${TRAEFIK_PORT_HTTPS:-} \
|
||||||
--o:home_mode.enable=${COLLABORA_HOME_MODE:-false}
|
--o:home_mode.enable=${COLLABORA_HOME_MODE:-false}
|
||||||
username: ${COLLABORA_ADMIN_USER:-admin}
|
username: ${COLLABORA_ADMIN_USER:-admin}
|
||||||
password: ${COLLABORA_ADMIN_PASSWORD:-admin}
|
password: ${COLLABORA_ADMIN_PASSWORD:-admin}
|
||||||
cap_add:
|
cap_add:
|
||||||
- SYS_ADMIN
|
|
||||||
- MKNOD
|
- MKNOD
|
||||||
security_opt:
|
|
||||||
- seccomp=unconfined
|
|
||||||
- apparmor:unconfined
|
|
||||||
volumes:
|
volumes:
|
||||||
# Mount local TrueType fonts so the container can use system fonts
|
# Mount local TrueType fonts so the container can use system fonts
|
||||||
# (e.g. Microsoft fonts like Arial, Calibri, Cambria by installing the `ttf-mscorefonts-installer` package).
|
# (e.g. Microsoft fonts like Arial, Calibri, Cambria by installing the `ttf-mscorefonts-installer` package).
|
||||||
|
|||||||
Reference in New Issue
Block a user