Add https xforwar to keycloak

SciCatProject · Aug 16, 2024 · 6bb1be4 · 6bb1be4
1 parent fe47f27
commit 6bb1be4
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 16 deletions.
diff --git a/services/backend/services/keycloak/.compose.https.yaml b/services/backend/services/keycloak/.compose.https.yaml
@@ -0,0 +1 @@
+../../../.empty.yaml
diff --git a/services/backend/services/keycloak/compose.base.yaml b/services/backend/services/keycloak/compose.base.yaml
@@ -0,0 +1,16 @@
+services:
+  keycloak:
+    image: quay.io/keycloak/keycloak:25.0
+    command: start-dev --import-realm --http-port=80
+    env_file: ./config/.env
+    volumes:
+      - ./healthcheck/healthcheck.sh:/healthcheck.sh
+      - ./config/facility-realm.json:/opt/keycloak/data/import/facility-realm.json:ro
+    labels:
+      - traefik.http.services.keycloak.loadbalancer.server.port=80
+    healthcheck:
+      test: bash /healthcheck.sh
+      start_period: 5s
+      interval: 30s
+      timeout: 10s
+      retries: 5
diff --git a/services/backend/services/keycloak/compose.https.yaml b/services/backend/services/keycloak/compose.https.yaml
@@ -0,0 +1,6 @@
+services:
+  keycloak:
+    env_file:
+      - ./config/.https.env
+    labels:
+      - traefik.http.services.keycloak.loadbalancer.passhostheader=true
diff --git a/services/backend/services/keycloak/compose.yaml b/services/backend/services/keycloak/compose.yaml
@@ -1,16 +1,4 @@
-services:
-  keycloak:
-    image: quay.io/keycloak/keycloak:25.0
-    command: start-dev --import-realm --http-port=80
-    env_file: ./config/.env
-    volumes:
-      - ./healthcheck/healthcheck.sh:/healthcheck.sh
-      - ./config/facility-realm.json:/opt/keycloak/data/import/facility-realm.json:ro
-    labels:
-      - traefik.http.services.keycloak.loadbalancer.server.port=80
-    healthcheck:
-      test: bash /healthcheck.sh
-      start_period: 5s
-      interval: 30s
-      timeout: 10s
-      retries: 5
+include:
+  - path:
+      - compose.base.yaml
+      - .${KEYCLOAK_HTTPS_URL:+/}compose.https.yaml
diff --git a/services/backend/services/keycloak/config/.https.env b/services/backend/services/keycloak/config/.https.env
@@ -0,0 +1,2 @@
+KC_PROXY_HEADERS=xforwarded
+PROXY_ADDRESS_FORWARDING=true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		KC_PROXY_HEADERS=xforwarded
		PROXY_ADDRESS_FORWARDING=true