From 8756dbe42c239c7ae5ec47b20b716e9a546ffefe Mon Sep 17 00:00:00 2001 From: turegjorup Date: Mon, 26 Oct 2026 16:30:27 +0100 Subject: [PATCH 1/2] chore: update docker compose files from itkdev-docker templates --- docker-compose.server.yml | 2 +- docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.server.yml b/docker-compose.server.yml index 45f2720c..7b811f22 100644 --- a/docker-compose.server.yml +++ b/docker-compose.server.yml @@ -21,7 +21,7 @@ services: - .:/app nginx: - image: nginxinc/nginx-unprivileged:alpine + image: nginx/nginx-unprivileged:alpine restart: unless-stopped networks: - app diff --git a/docker-compose.yml b/docker-compose.yml index 444ce64d..266fb912 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,7 +48,7 @@ services: - .:/app nginx: - image: nginxinc/nginx-unprivileged:alpine + image: nginx/nginx-unprivileged:alpine networks: - app - frontend @@ -103,7 +103,7 @@ services: - ./:/md prettier: - # Prettier does not (yet, fcf. + # Prettier does not (yet, cf. # https://github.com/prettier/prettier/issues/15206) have an official # docker image. # https://hub.docker.com/r/jauderho/prettier is good candidate (cf. https://hub.docker.com/search?q=prettier&sort=updated_at&order=desc) From 12fc5ac66e92b34edf63c289a8e4097e75bb41a5 Mon Sep 17 00:00:00 2001 From: turegjorup Date: Mon, 26 Oct 2026 16:33:50 +0100 Subject: [PATCH 2/2] chore: move /health/detail labels to override files --- docker-compose.override.yml | 7 +++++++ docker-compose.server.override.yml | 8 ++++++++ docker-compose.server.yml | 5 ----- docker-compose.yml | 4 ---- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index d7ed0471..2044e97f 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,4 +1,11 @@ services: + nginx: + labels: + # Detailed health check protection. /health/live and /health/ready stay + # public; only /health/detail discloses internals. + - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-health.rule=Host(`${COMPOSE_DOMAIN:?}`) && PathPrefix(`/health/detail`)" + - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-health.middlewares=ITKBasicAuth@file" + # A mock identity provider, so the OpenID Connect login can be exercised locally. # The real one has no redirect URI registered for a developer machine. # diff --git a/docker-compose.server.override.yml b/docker-compose.server.override.yml index 994958e4..86717971 100644 --- a/docker-compose.server.override.yml +++ b/docker-compose.server.override.yml @@ -1,4 +1,12 @@ services: + nginx: + labels: + # Detailed health check protection. /health/live and /health/ready stay + # public; only /health/detail discloses internals. + - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-health.rule=Host(`${COMPOSE_SERVER_DOMAIN:?}`) && PathPrefix(`/health/detail`)" + - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-health.entrypoints=websecure" + - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-health.middlewares=ITKBasicAuth@file" + rabbit: image: rabbitmq:4-management-alpine restart: unless-stopped diff --git a/docker-compose.server.yml b/docker-compose.server.yml index 7b811f22..4ecac634 100644 --- a/docker-compose.server.yml +++ b/docker-compose.server.yml @@ -50,8 +50,3 @@ services: # Cron-metrics protection. - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-metrics.rule=Host(`${COMPOSE_SERVER_DOMAIN:?}`) && PathPrefix(`/cron-metrics`) " - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-metrics.middlewares=ITKMetricsAuth@file" - # Detailed health check protection. /health/live and /health/ready stay - # public; only /health/detail discloses internals. - - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-health.rule=Host(`${COMPOSE_SERVER_DOMAIN:?}`) && PathPrefix(`/health/detail`)" - - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-health.entrypoints=websecure" - - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-health.middlewares=ITKBasicAuth@file" diff --git a/docker-compose.yml b/docker-compose.yml index 266fb912..e30ba146 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -75,10 +75,6 @@ services: # Cron-metrics protection. - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-metrics.rule=Host(`${COMPOSE_DOMAIN:?}`) && PathPrefix(`/cron-metrics`) " - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-metrics.middlewares=ITKMetricsAuth@file" - # Detailed health check protection. /health/live and /health/ready stay - # public; only /health/detail discloses internals. - - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-health.rule=Host(`${COMPOSE_DOMAIN:?}`) && PathPrefix(`/health/detail`)" - - "traefik.http.routers.${COMPOSE_PROJECT_NAME:?}-health.middlewares=ITKBasicAuth@file" mail: image: axllent/mailpit