From 9e3995ecc934c367bda9ebb16685a95aae186f81 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 1 Feb 2021 13:33:01 +0100 Subject: [PATCH] fix keycloak realm import domain --- .../config/keycloak/docker-entrypoint-override.sh | 8 ++++++++ .../keycloak/{ocis-realm.json => ocis-realm.dist.json} | 0 deployments/examples/ocis_keycloak/docker-compose.yml | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 deployments/examples/ocis_keycloak/config/keycloak/docker-entrypoint-override.sh rename deployments/examples/ocis_keycloak/config/keycloak/{ocis-realm.json => ocis-realm.dist.json} (100%) diff --git a/deployments/examples/ocis_keycloak/config/keycloak/docker-entrypoint-override.sh b/deployments/examples/ocis_keycloak/config/keycloak/docker-entrypoint-override.sh new file mode 100644 index 000000000..c6948c50a --- /dev/null +++ b/deployments/examples/ocis_keycloak/config/keycloak/docker-entrypoint-override.sh @@ -0,0 +1,8 @@ +#!/bin/bash +printenv +# replace oCIS domain in keycloak realm import +cp /opt/jboss/keycloak/ocis-realm.dist.json /opt/jboss/keycloak/ocis-realm.json +sed -i "s/ocis.owncloud.test/${OCIS_DOMAIN}/g" /opt/jboss/keycloak/ocis-realm.json + +# run original docker-entrypoint +/opt/jboss/tools/docker-entrypoint.sh diff --git a/deployments/examples/ocis_keycloak/config/keycloak/ocis-realm.json b/deployments/examples/ocis_keycloak/config/keycloak/ocis-realm.dist.json similarity index 100% rename from deployments/examples/ocis_keycloak/config/keycloak/ocis-realm.json rename to deployments/examples/ocis_keycloak/config/keycloak/ocis-realm.dist.json diff --git a/deployments/examples/ocis_keycloak/docker-compose.yml b/deployments/examples/ocis_keycloak/docker-compose.yml index c4653e7e4..97aacea28 100644 --- a/deployments/examples/ocis_keycloak/docker-compose.yml +++ b/deployments/examples/ocis_keycloak/docker-compose.yml @@ -97,9 +97,12 @@ services: image: quay.io/keycloak/keycloak:latest networks: ocis-net: + entrypoint: ["/bin/sh", "/opt/jboss/tools/docker-entrypoint-override.sh"] volumes: - - ./config/keycloak/ocis-realm.json:/opt/jboss/keycloak/ocis-realm.json + - ./config/keycloak/docker-entrypoint-override.sh:/opt/jboss/tools/docker-entrypoint-override.sh + - ./config/keycloak/ocis-realm.dist.json:/opt/jboss/keycloak/ocis-realm.dist.json environment: + OCIS_DOMAIN: ${OCIS_DOMAIN:-ocis.owncloud.test} DB_VENDOR: POSTGRES DB_ADDR: postgres DB_DATABASE: keycloak