From 164dbbddb7507ab59ab41fda4ccc6a41518e400b Mon Sep 17 00:00:00 2001
From: Jacob Benz <jacob.benz@h-da.de>
Date: Mon, 13 Jan 2025 15:39:47 +0100
Subject: [PATCH] remove hard coded dependency to env file
---
docker-compose-keycloak-firstrun.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/docker-compose-keycloak-firstrun.yml b/docker-compose-keycloak-firstrun.yml
index 80efe9f..8e1766b 100644
--- a/docker-compose-keycloak-firstrun.yml
+++ b/docker-compose-keycloak-firstrun.yml
@@ -9,8 +9,6 @@ services:
# Import LINCS realm
keycloak-firstrun:
image: adorsys/keycloak-config-cli:latest
- env_file:
- - "../leafwriter.env"
environment:
- KEYCLOAK_URL=http://keycloak:8080/
- KEYCLOAK_USER=tempadmin
@@ -19,6 +17,8 @@ services:
- KEYCLOAK_AVAILABILITYCHECK_TIMEOUT=120s
- IMPORT_FILES_LOCATIONS=/config/leafwriter-conf.json
- IMPORT_VARSUBSTITUTION_ENABLED=true
+ - admin_cli_secret=${admin_cli_secret}
+ - leafwriter_domain=${leafwriter_domain}
volumes:
- ./keycloak-provisioning-files:/config
depends_on:
@@ -29,8 +29,6 @@ services:
# Second run of Keycloak-config-cli Tool to automatically create permanent Keycloak admin, used for gui login as well as auth-api
keycloak-secondrun:
image: adorsys/keycloak-config-cli:latest
- env_file:
- - "../leafwriter.env"
environment:
- KEYCLOAK_URL=http://keycloak:8080/
- KEYCLOAK_USER=tempadmin
@@ -39,6 +37,8 @@ services:
- KEYCLOAK_AVAILABILITYCHECK_TIMEOUT=120s
- IMPORT_FILES_LOCATIONS=/config/leafwriter-conf-master.json
- IMPORT_VARSUBSTITUTION_ENABLED=true
+ - keycloak_admin=${keycloak_admin}
+ - keycloak_password=${keycloak_password}
volumes:
- ./keycloak-provisioning-files:/config
depends_on:
@@ -52,8 +52,6 @@ services:
# Third run to disable Keycloak temporary admin, otherwise Keycloak is complaining, but Keycloak can not get it right an accept an expiration time for its temporary admin, which the dumb issue where they introduced the behavior promised to have …
keycloak-thirdrun:
image: adorsys/keycloak-config-cli:latest
- env_file:
- - "../leafwriter.env"
environment:
- KEYCLOAK_URL=http://keycloak:8080/
- KEYCLOAK_USER=${keycloak_admin}
--
GitLab