From 277993dbc310232164b1c8a9f906e2063be1aa6a Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Tue, 1 Apr 2025 10:16:09 +0530 Subject: [PATCH] Upgrade keycloak docker image version to 26.1.2 Adapt new version changes in identity service - env vars and themes Issue-ID: OAM-449 Change-Id: I6e0aed8f49be71f3f84122479dd041f453b56c44 Signed-off-by: Ravi Pendurty --- solution/smo/common/.env | 2 +- solution/smo/common/docker-compose.yaml | 6 ++++-- solution/smo/common/identity/themes/oam/account/theme.properties | 4 ++-- solution/smo/common/identity/themes/oam/admin/theme.properties | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/solution/smo/common/.env b/solution/smo/common/.env index 83eb228..da35a0b 100644 --- a/solution/smo/common/.env +++ b/solution/smo/common/.env @@ -33,7 +33,7 @@ TRAEFIK_DOMAIN_CERT_FILE=mydomain_cert.pem # in PEM format TRAEFIK_DOMAIN_CERT_KEY_FILE=mydomain_key.pem # in PEM format # Identity server -IDENTITY_IMAGE=bitnami/keycloak:18.0.2 +IDENTITY_IMAGE=bitnami/keycloak:26.1.2 IDENTITYDB_IMAGE=docker.io/bitnami/postgresql:13 IDENTITY_MGMT_USERNAME=manager IDENTITY_MGMT_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U diff --git a/solution/smo/common/docker-compose.yaml b/solution/smo/common/docker-compose.yaml index 66646cd..7011e32 100755 --- a/solution/smo/common/docker-compose.yaml +++ b/solution/smo/common/docker-compose.yaml @@ -101,8 +101,8 @@ services: hostname: identity environment: KEYCLOAK_CREATE_ADMIN_USER: true - KEYCLOAK_ADMIN_USER: ${ADMIN_USERNAME} - KEYCLOAK_ADMIN_PASSWORD: ${ADMIN_PASSWORD} + KC_BOOTSTRAP_ADMIN_USERNAME: ${ADMIN_USERNAME} + KC_BOOTSTRAP_ADMIN_PASSWORD: ${ADMIN_PASSWORD} KEYCLOAK_MANAGEMENT_USER: ${IDENTITY_MGMT_USERNAME} KEYCLOAK_MANAGEMENT_PASSWORD: ${IDENTITY_MGMT_PASSWORD} KEYCLOAK_DATABASE_HOST: identitydb @@ -116,6 +116,8 @@ services: KEYCLOAK_TLS_TRUSTSTORE_FILE: /opt/bitnami/keycloak/certs/truststore.jks KEYCLOAK_TLS_KEYSTORE_PASSWORD: password KEYCLOAK_TLS_TRUSTSTORE_PASSWORD: changeit + KC_HOSTNAME: "https://identity.${HTTP_DOMAIN}" + KC_HOSTNAME_ADMIN: "https://identity.${HTTP_DOMAIN}" KEYCLOAK_EXTRA_ARGS: "--spi-theme-default=oam" restart: unless-stopped volumes: diff --git a/solution/smo/common/identity/themes/oam/account/theme.properties b/solution/smo/common/identity/themes/oam/account/theme.properties index 12d9c19..d4b30d4 100644 --- a/solution/smo/common/identity/themes/oam/account/theme.properties +++ b/solution/smo/common/identity/themes/oam/account/theme.properties @@ -1,2 +1,2 @@ -parent=keycloak -import=common/keycloak \ No newline at end of file +parent=keycloak.v3 +import=common/keycloak diff --git a/solution/smo/common/identity/themes/oam/admin/theme.properties b/solution/smo/common/identity/themes/oam/admin/theme.properties index 12d9c19..bfdf553 100644 --- a/solution/smo/common/identity/themes/oam/admin/theme.properties +++ b/solution/smo/common/identity/themes/oam/admin/theme.properties @@ -1,2 +1,2 @@ -parent=keycloak -import=common/keycloak \ No newline at end of file +parent=keycloak.v2 +import=common/keycloak -- 2.16.6