From c81459e0aa2c915994451c85e67dd63ae3f61757 Mon Sep 17 00:00:00 2001 From: Timo Schneider Date: Thu, 30 May 2024 18:12:46 +0200 Subject: [PATCH] try to get it to run again --- docker-compose.yaml | 48 +++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 329f728..2f9f753 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -10,6 +10,8 @@ services: KC_DB_SCHEMA: public KC_DB_URL: jdbc:postgresql://keycloak-db/keycloak #KC_HTTP_RELATIVE_PATH: /auth + PROXY_ADDRESS_FORWARDING: true + KEYCLOAK_HOSTNAME: keycloak.local.anxietyprime.de expose: - 8080 networks: @@ -22,7 +24,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.keycloak.rule=Host(`keycloak.local.anxietyprime.de`)" - "traefik.http.routers.keycloak.entrypoints=websecure" - - "traefik.http.routers.keycloak.tls.certresolver=letsencrypt" + - "traefik.http.routers.keycloak.tls.domains[0].main=keycloak.local.anxietyprime.de" - "traefik.http.services.keycloak.loadbalancer.server.port=8080" - "traefik.http.routers.keycloak.service=keycloak" healthcheck: @@ -56,28 +58,28 @@ services: restart: always frontend: - image: hub.anxietyprime.de/swa-jodel/frontend:latest - container_name: swa-frontend - expose: - - 80 - networks: - swa-public: - labels: + image: hub.anxietyprime.de/swa-jodel/frontend:latest + container_name: swa-frontend + expose: + - 80 + networks: + swa-public: + labels: - "traefik.enable=true" - - "traefik.http.routers.jodel.rule=Host(`jodel.local.anxietyprime.de`)" - - "traefik.http.routers.jodel.entrypoints=websecure" - - "traefik.http.routers.jodel.tls.certresolver=letsencrypt" - - "traefik.http.services.jodel.loadbalancer.server.port=80" - - "traefik.http.routers.jodel.service=jodel" - healthcheck: - test: ["CMD", "service", "nginx", "status"] - interval: 5s - timeout: 5s - retries: 30 - depends_on: - backend: - condition: service_healthy - restart: always + - "traefik.http.routers.web-jodel.rule=Host(`jodel.local.anxietyprime.de`)" + - "traefik.http.routers.web-jodel.entrypoints=websecure" + - "traefik.http.routers.web-jodel.tls.domains[0].main=jodel.local.anxietyprime.de" + - "traefik.http.services.web-jodel.loadbalancer.server.port=80" + - "traefik.http.routers.web-jodel.service=web-jodel" + healthcheck: + test: echo "" + interval: 5s + timeout: 5s + retries: 30 + depends_on: + backend: + condition: service_healthy + restart: always backend: image: hub.anxietyprime.de/swa-jodel/backend:latest @@ -96,7 +98,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.api-jodel.rule=Host(`api.jodel.local.anxietyprime.de`)" - "traefik.http.routers.api-jodel.entrypoints=websecure" - - "traefik.http.routers.api-jodel.tls.certresolver=letsencrypt" + - "traefik.http.routers.api-jodel.tls.domains[0].main=api.jodel.local.anxietyprime.de" - "traefik.http.services.api-jodel.loadbalancer.server.port=8080" - "traefik.http.routers.api-jodel.service=api-jodel" healthcheck: