Skip to content
Snippets Groups Projects
Commit 164dbbdd authored by Jacob Benz's avatar Jacob Benz
Browse files

remove hard coded dependency to env file

parent 177df868
No related branches found
No related tags found
No related merge requests found
...@@ -9,8 +9,6 @@ services: ...@@ -9,8 +9,6 @@ services:
# Import LINCS realm # Import LINCS realm
keycloak-firstrun: keycloak-firstrun:
image: adorsys/keycloak-config-cli:latest image: adorsys/keycloak-config-cli:latest
env_file:
- "../leafwriter.env"
environment: environment:
- KEYCLOAK_URL=http://keycloak:8080/ - KEYCLOAK_URL=http://keycloak:8080/
- KEYCLOAK_USER=tempadmin - KEYCLOAK_USER=tempadmin
...@@ -19,6 +17,8 @@ services: ...@@ -19,6 +17,8 @@ services:
- KEYCLOAK_AVAILABILITYCHECK_TIMEOUT=120s - KEYCLOAK_AVAILABILITYCHECK_TIMEOUT=120s
- IMPORT_FILES_LOCATIONS=/config/leafwriter-conf.json - IMPORT_FILES_LOCATIONS=/config/leafwriter-conf.json
- IMPORT_VARSUBSTITUTION_ENABLED=true - IMPORT_VARSUBSTITUTION_ENABLED=true
- admin_cli_secret=${admin_cli_secret}
- leafwriter_domain=${leafwriter_domain}
volumes: volumes:
- ./keycloak-provisioning-files:/config - ./keycloak-provisioning-files:/config
depends_on: depends_on:
...@@ -29,8 +29,6 @@ services: ...@@ -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 # Second run of Keycloak-config-cli Tool to automatically create permanent Keycloak admin, used for gui login as well as auth-api
keycloak-secondrun: keycloak-secondrun:
image: adorsys/keycloak-config-cli:latest image: adorsys/keycloak-config-cli:latest
env_file:
- "../leafwriter.env"
environment: environment:
- KEYCLOAK_URL=http://keycloak:8080/ - KEYCLOAK_URL=http://keycloak:8080/
- KEYCLOAK_USER=tempadmin - KEYCLOAK_USER=tempadmin
...@@ -39,6 +37,8 @@ services: ...@@ -39,6 +37,8 @@ services:
- KEYCLOAK_AVAILABILITYCHECK_TIMEOUT=120s - KEYCLOAK_AVAILABILITYCHECK_TIMEOUT=120s
- IMPORT_FILES_LOCATIONS=/config/leafwriter-conf-master.json - IMPORT_FILES_LOCATIONS=/config/leafwriter-conf-master.json
- IMPORT_VARSUBSTITUTION_ENABLED=true - IMPORT_VARSUBSTITUTION_ENABLED=true
- keycloak_admin=${keycloak_admin}
- keycloak_password=${keycloak_password}
volumes: volumes:
- ./keycloak-provisioning-files:/config - ./keycloak-provisioning-files:/config
depends_on: depends_on:
...@@ -52,8 +52,6 @@ services: ...@@ -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 … # 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: keycloak-thirdrun:
image: adorsys/keycloak-config-cli:latest image: adorsys/keycloak-config-cli:latest
env_file:
- "../leafwriter.env"
environment: environment:
- KEYCLOAK_URL=http://keycloak:8080/ - KEYCLOAK_URL=http://keycloak:8080/
- KEYCLOAK_USER=${keycloak_admin} - KEYCLOAK_USER=${keycloak_admin}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment