From b6ec2214f2c374b6c2b4dee8cffddf8ac33c830b Mon Sep 17 00:00:00 2001 From: pradip Date: Fri, 13 Nov 2026 14:46:31 +0545 Subject: [PATCH] ci: fix deployment test teardown and update traefik in the examples Signed-off-by: pradip --- .github/workflows/deployment-test.yml | 16 +++++++++++----- ...ate-traefik-image-some-deployment-examples.md | 9 +++++++++ .../examples/ocis_hello/docker-compose.yml | 2 +- .../examples/ocis_keycloak/docker-compose.yml | 2 +- .../examples/ocis_ldap/docker-compose.yml | 2 +- .../examples/ocis_multi/docker-compose.yml | 2 +- 6 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 changelog/unreleased/update-traefik-image-some-deployment-examples.md diff --git a/.github/workflows/deployment-test.yml b/.github/workflows/deployment-test.yml index e1d230f4e082..1c126271bade 100644 --- a/.github/workflows/deployment-test.yml +++ b/.github/workflows/deployment-test.yml @@ -46,16 +46,22 @@ jobs: run: | echo "127.0.0.1 ocis.owncloud.test collabora.owncloud.test keycloak.owncloud.test mail.owncloud.test minio.owncloud.test onlyoffice.owncloud.test tika ldap.owncloud.test ocis.ocm.owncloud.test ocis.ocm.next.owncloud.test collabora.ocm.owncloud.test" | sudo tee -a /etc/hosts + - name: Generate collabora credentials + run: | + set -e + + # the Collabora admin console requires explicit credentials. Persist them via + # $GITHUB_ENV so every later step (including the teardown) can interpolate them. + PASSWORD="$(openssl rand -hex 16)" + echo "::add-mask::$PASSWORD" + echo "COLLABORA_ADMIN_USER=admin" >> "$GITHUB_ENV" + echo "COLLABORA_ADMIN_PASSWORD=$PASSWORD" >> "$GITHUB_ENV" + - name: Run compose stack working-directory: deployments/examples/${{ matrix.example }} run: | set -e echo "=== Running ${{ matrix.example }} ===" - - # the Collabora admin console requires explicit credentials - export COLLABORA_ADMIN_USER=admin - COLLABORA_ADMIN_PASSWORD="$(openssl rand -hex 16)" - export COLLABORA_ADMIN_PASSWORD if [ "${{ matrix.example }}" = "ocis_ocm" ]; then export INSECURE=true diff --git a/changelog/unreleased/update-traefik-image-some-deployment-examples.md b/changelog/unreleased/update-traefik-image-some-deployment-examples.md new file mode 100644 index 000000000000..bfc03ed0a2e7 --- /dev/null +++ b/changelog/unreleased/update-traefik-image-some-deployment-examples.md @@ -0,0 +1,9 @@ +Enhancement: Update Traefik in the LDAP, Keycloak, Hello and Multi examples + +The `ocis_ldap`, `ocis_keycloak` and `ocis_hello` examples pinned +`traefik:v2.9.1`. Its Docker provider can not communicate with Docker Engine 29 +and later, so Traefik loads no configuration at all on such hosts and answers +every request with `404`. `ocis_multi` was on `traefik:v3.6.7`. + +All of them now run `traefik:v3.6.10`, which is compatible with Docker Engine 29 +and later. diff --git a/deployments/examples/ocis_hello/docker-compose.yml b/deployments/examples/ocis_hello/docker-compose.yml index 24014492a3d1..636f7526b662 100644 --- a/deployments/examples/ocis_hello/docker-compose.yml +++ b/deployments/examples/ocis_hello/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: traefik: - image: traefik:v2.9.1 + image: traefik:v3.6.10 networks: ocis-net: aliases: diff --git a/deployments/examples/ocis_keycloak/docker-compose.yml b/deployments/examples/ocis_keycloak/docker-compose.yml index 8d3d6ab35f12..a0517c82e2f1 100644 --- a/deployments/examples/ocis_keycloak/docker-compose.yml +++ b/deployments/examples/ocis_keycloak/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: traefik: - image: traefik:v2.9.1 + image: traefik:v3.6.10 networks: ocis-net: aliases: diff --git a/deployments/examples/ocis_ldap/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml index a036742266af..67d8f48f8fe3 100644 --- a/deployments/examples/ocis_ldap/docker-compose.yml +++ b/deployments/examples/ocis_ldap/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: traefik: - image: traefik:v2.9.1 + image: traefik:v3.6.10 networks: ocis-net: aliases: diff --git a/deployments/examples/ocis_multi/docker-compose.yml b/deployments/examples/ocis_multi/docker-compose.yml index dc7c2fed70c0..a9c72f1cce0e 100644 --- a/deployments/examples/ocis_multi/docker-compose.yml +++ b/deployments/examples/ocis_multi/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: traefik: - image: traefik:v3.6.7 + image: traefik:v3.6.10 networks: ocis-net: aliases: