diff --git a/changelog/unreleased/update-ocis_full-traefik-image.md b/changelog/unreleased/update-ocis_full-traefik-image.md new file mode 100644 index 00000000000..3c535f1e4a1 --- /dev/null +++ b/changelog/unreleased/update-ocis_full-traefik-image.md @@ -0,0 +1,6 @@ +Enhancement: Update the ocis_full deployment example traefik image + +* Traefik: 3.6.4 +* Traefik fix for Collabora + +https://github.com/owncloud/ocis/pull/11867 diff --git a/deployments/examples/ocis_full/.env b/deployments/examples/ocis_full/.env index a6358914544..44db9ba0235 100644 --- a/deployments/examples/ocis_full/.env +++ b/deployments/examples/ocis_full/.env @@ -12,7 +12,7 @@ INSECURE=true # Note: Traefik is always enabled and can't be disabled. # The recommended (and tested) version to pull. If no version is used, it pulls "latest" # release notes: https://github.com/traefik/traefik/releases -TRAEFIK_DOCKER_TAG=v3.6.2 +TRAEFIK_DOCKER_TAG=v3.6.4 # Serve Traefik dashboard. # Defaults to "false". TRAEFIK_DASHBOARD= diff --git a/deployments/examples/ocis_full/docker-compose.yml b/deployments/examples/ocis_full/docker-compose.yml index d8ac6fe46d0..551b0be9a38 100644 --- a/deployments/examples/ocis_full/docker-compose.yml +++ b/deployments/examples/ocis_full/docker-compose.yml @@ -23,6 +23,10 @@ services: - "--entryPoints.https.transport.respondingTimeouts.readTimeout=12h" - "--entryPoints.https.transport.respondingTimeouts.writeTimeout=12h" - "--entryPoints.https.transport.respondingTimeouts.idleTimeout=3m" + # allow encoded characters which is required for collaboration/Collabora + - "--entryPoints.https.http.encodedCharacters.allowEncodedSlash=true" + - "--entryPoints.https.http.encodedCharacters.allowEncodedQuestionMark=true" + - "--entryPoints.https.http.encodedCharacters.allowEncodedPercent=true" # docker provider (get configuration from container labels) - "--providers.docker.endpoint=unix:///var/run/docker.sock" - "--providers.docker.exposedByDefault=false"