fix: compose werkt nu

This commit is contained in:
Timo De Meyst 2025-04-25 00:03:55 +02:00
parent 026194367e
commit fa51285c5a

View file

@ -45,7 +45,7 @@ services:
keycloak-db: keycloak-db:
image: postgres:latest image: postgres:latest
ports: ports:
- '5442:5432' # Port numbers 10 higher than normal postgres ports - '5442:5432' # Port number 10 higher than normal postgres ports
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- dwengo_postgres_keycloak:/var/lib/postgresql/keycloak - dwengo_postgres_keycloak:/var/lib/postgresql/keycloak
@ -53,7 +53,6 @@ services:
POSTGRES_USER: keycloak POSTGRES_USER: keycloak
POSTGRES_PASSWORD: ChangeMe POSTGRES_PASSWORD: ChangeMe
POSTGRES_DB: keycloak POSTGRES_DB: keycloak
networks: networks:
- dwengo-1 - dwengo-1
@ -61,19 +60,17 @@ services:
extends: extends:
file: ./compose.yml file: ./compose.yml
service: idp service: idp
# TODO Replace with proper production command
command: ['start', '--http-port', '7080', '--https-port', '7443', '--import-realm'] command: ['start', '--http-port', '7080', '--https-port', '7443', '--import-realm']
networks: networks:
- dwengo-1 - dwengo-1
depends_on:
- keycloak-db
labels: labels:
- 'traefik.enable=true' - 'traefik.enable=true'
- 'traefik.http.routers.idp.rule=PathPrefix(`/idp`)' - 'traefik.http.routers.idp.rule=PathPrefix(`/idp`)'
- 'traefik.http.services.idp.loadbalancer.server.port=7080' - 'traefik.http.services.idp.loadbalancer.server.port=7080'
- 'traefik.http.routers.block-admin.rule=PathPrefix(`/idp/admin`)' - 'traefik.http.routers.block-admin.rule=PathPrefix(`/idp/admin`)'
- 'traefik.http.routers.block-admin.service=web' - 'traefik.http.routers.block-admin.service=web'
- "traefik.tcp.routers.idp.tls.passthrough=true" # Keycloak expects TLS in production mode, so it can't be terminated by the reverse proxy depends_on:
- keycloak-db
volumes: volumes:
- /etc/keycloak:/keycloak - /etc/keycloak:/keycloak
env_file: env_file:
@ -82,6 +79,7 @@ services:
KC_HOSTNAME: 'sel2-1.ugent.be' KC_HOSTNAME: 'sel2-1.ugent.be'
PROXY_ADDRESS_FORWARDING: 'true' PROXY_ADDRESS_FORWARDING: 'true'
KC_PROXY_HEADERS: 'xforwarded' KC_PROXY_HEADERS: 'xforwarded'
KC_HTTP_ENABLED: 'true'
KC_HTTP_RELATIVE_PATH: '/idp' KC_HTTP_RELATIVE_PATH: '/idp'
KC_HTTPS_CERTIFICATE_FILE: '/keycloak/cert.pem' KC_HTTPS_CERTIFICATE_FILE: '/keycloak/cert.pem'
KC_HTTPS_CERTIFICATE_KEY_FILE: '/keycloak/key.pem' KC_HTTPS_CERTIFICATE_KEY_FILE: '/keycloak/key.pem'
@ -152,4 +150,4 @@ volumes:
dwengo_postgres_keycloak: dwengo_postgres_keycloak:
networks: networks:
dwengo-1: dwengo-1: