From 5a3b2683bcfd52b9a736dcc2a52849d57acea583 Mon Sep 17 00:00:00 2001
From: holzi1005 <andreas.holzmann@h2-invent.com>
Date: Sun, 8 Dec 2024 15:48:28 +0100
Subject: [PATCH] update

---
 .docker-compose.http.yml | 14 ++++++++++++--
 setup.sh                 |  5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.docker-compose.http.yml b/.docker-compose.http.yml
index 627b051..92d475c 100644
--- a/.docker-compose.http.yml
+++ b/.docker-compose.http.yml
@@ -96,8 +96,18 @@ services:
     depends_on:
       app-ja:
         condition: service_healthy
-    env_file:
-      - ./.env.local
+    environment:
+      KEYCLOAK_ADMIN: admin
+      KEYCLOAK_ADMIN_PASSWORD: <keycloakAdminPw>
+      KC_DB: mariadb
+      KC_DB_PASSWORD: <keycloak-pw>
+      KC_DB_URL: jdbc:mariadb://db-ja:3306/keycloak
+      KC_DB_USERNAME: keycloak
+      KC_HOSTNAME_URL: <httpMethod>://<clientUrl>/keycloak
+      KC_HOSTNAME_PATH: <httpMethod>://<clientUrl>/keycloak
+      KC_HOSTNAME_ADMIN_URL: <httpMethod>://<clientUrl>/keycloak
+      KC_HTTP_RELATIVE_PATH: /keycloak
+      KC_PROXY: passthrough
     restart: unless-stopped
     command:
       - start-dev
diff --git a/setup.sh b/setup.sh
index 647be74..2120c74 100644
--- a/setup.sh
+++ b/setup.sh
@@ -133,6 +133,11 @@ echo ------------------------------------------------------------
 echo ""
 cp .docker-compose.$HTTP_METHOD.yml docker-compose.yml
 
+sed -i "s|<keycloakAdminPw>|$KEYCLOAK_ADMIN_PW|g" docker-compose.yml
+sed -i "s|<keycloak-pw>|$KEYCLOAK_PW|g" docker-compose.yml
+sed -i "s|<clientsecret>|$OAUTH_KEYCLOAK_CLIENT_ID|g" docker-compose.yml
+sed -i "s|<clientUrl>|$PUBLIC_URL|g" docker-compose.yml
+sed -i "s|<httpMethod>|$HTTP_METHOD|g" docker-compose.yml
 sed -i "s|<clientUrl>|$PUBLIC_URL|g" docker-compose.yml
 sed -i "s|<hostIp>|$HOST_IP|g" docker-compose.yml