From a67818381d94016d346f98bc72098d2a996211f1 Mon Sep 17 00:00:00 2001 From: Emmanuel Nyachoke Date: Thu, 29 Aug 2024 16:34:48 +0300 Subject: [PATCH] OZ-671: Fix SSO when deploying alongside Ozone Pro (#31) * OZ-671: Fix SSO when deploying alongside Ozone Pro * remov uneeded KEYCLOAK_HOSTNAME --- docker/.env | 3 ++- docker/docker-compose-superset.yaml | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docker/.env b/docker/.env index 4a59190..fbf97ef 100644 --- a/docker/.env +++ b/docker/.env @@ -45,6 +45,7 @@ REDIS_HOST=redis REDIS_PORT=6379 SUPERSET_CLIENT_SECRET= SUPERSET_CLIENT_ID=superset +SUPERSET_HOSTNAME= ANALYTICS_DATASOURCE_NAME=PostgreSQL ENABLE_OAUTH=false @@ -118,4 +119,4 @@ SUPERSET_HOME= ZOOKEEPER_URL=zookeeper:2181 #Keycloak -KEYCLOAK_HOSTNAME= +KEYCLOAK_HOSTNAME= \ No newline at end of file diff --git a/docker/docker-compose-superset.yaml b/docker/docker-compose-superset.yaml index 986ea58..ea91d2e 100644 --- a/docker/docker-compose-superset.yaml +++ b/docker/docker-compose-superset.yaml @@ -1,5 +1,15 @@ services: - + env-substitution: + image: mekomsolutions/env-substitution + networks: + - ozone-analytics + restart: on-failure + environment: + - SUPERSET_PUBLIC_URL=https://${SUPERSET_HOSTNAME} + - KEYCLOAK_URL=https://${KEYCLOAK_HOSTNAME} + - KEYCLOAK_AUTH_SERVER_URL=https://${KEYCLOAK_HOSTNAME} + volumes: + - "${DISTRO_PATH}:/opt/env-substitution/files" superset: depends_on: redis: