Compare commits

..

5 Commits

Author SHA1 Message Date
Ralf Haferkamp
41b721b42b chore: Bump collabora to 25.04.9.1.1 2026-02-17 16:47:15 +01:00
Ralf Haferkamp
5ededbd4c9 collabora: Drop unneeded capabitlity
'MKNOD' is not longer required
2026-02-17 11:36:17 +01:00
Ralf Haferkamp
98294c2dee Reapply "fix: slow kit jail error server audit in collabora"
This reverts commit 6ecf59f078.
2026-02-17 11:35:26 +01:00
Alex
1a4f302855 chore: bump traefik to 3.6.7 (#212) 2026-02-03 10:53:31 +01:00
Alex
de88ca037b fix add back slash to traefik allowed encoded characters (#211) 2026-02-02 09:13:14 +01:00
3 changed files with 6 additions and 11 deletions

View File

@@ -23,14 +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 and file operations with supported encoded characters
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedSlash=true"
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedQuestionMark=true"
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedPercent=true"
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedSemicolon=true"
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedHash=true"
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedBackSlash=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"

View File

@@ -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.6.7
# 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:

View File

@@ -48,7 +48,7 @@ services:
restart: always restart: always
collabora: collabora:
image: collabora/code:25.04.7.1.1 image: collabora/code:25.04.9.1.1
# release notes: https://www.collaboraonline.com/release-notes/ # release notes: https://www.collaboraonline.com/release-notes/
networks: networks:
opencloud-net: opencloud-net:
@@ -66,7 +66,10 @@ services:
username: ${COLLABORA_ADMIN_USER:-admin} username: ${COLLABORA_ADMIN_USER:-admin}
password: ${COLLABORA_ADMIN_PASSWORD:-admin} password: ${COLLABORA_ADMIN_PASSWORD:-admin}
cap_add: cap_add:
- MKNOD - SYS_ADMIN
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).