diff --git a/minimal-setup/keycloak/docker-compose.yml b/minimal-setup/keycloak/docker-compose.yml index a2cfc9d..72f4cbb 100644 --- a/minimal-setup/keycloak/docker-compose.yml +++ b/minimal-setup/keycloak/docker-compose.yml @@ -104,7 +104,7 @@ services: # ENABLE_KEYCLOAK_API_KEYS: "true" # # to enable the permissions edition UI in OE2, you need to provide a KEYCLOAK_CLIENT_SECRET # KEYCLOAK_CLIENT_SECRET: "change-me-I-am-a-secret-you-get-in-keycloak-logs" - KEYCLOAK_CLIENT_SECRET: "BW4jmAQXmnegXXDXKy7SPuStxSoPSG7M" + KEYCLOAK_CLIENT_SECRET: "qU5qhuToGyKHY4xKcUob5BUePwNBfSoH" PUBLIC_ORTHANC_ROOT: "http://localhost/orthanc/" PUBLIC_LANDING_ROOT: "http://localhost/orthanc/ui/app/token-landing.html" # to use OHIF-plugin: make sure to use http://localhost/orthanc/ohif/ @@ -136,8 +136,10 @@ services: depends_on: [keycloak-db] restart: unless-stopped environment: - KEYCLOAK_ADMIN: "admin" - KEYCLOAK_ADMIN_PASSWORD: "change-me" + #KEYCLOAK_ADMIN: "admin" + #KEYCLOAK_ADMIN_PASSWORD: "change-me" + KC_BOOTSTRAP_ADMIN_USERNAME: "admin" + KC_BOOTSTRAP_ADMIN_PASSWORD: "change-me" KC_DB: "postgres" KC_DB_URL: "jdbc:postgresql://keycloak-db:5432/keycloak" KC_DB_USERNAME: "keycloak" diff --git a/release-notes.md b/release-notes.md index 581c5a5..735b032 100644 --- a/release-notes.md +++ b/release-notes.md @@ -8,6 +8,12 @@ v x.x.x ======== - Upgraded OHIF from v3.9.0-beta.56 to v3.9.2 +- Upgraded Keycloak from 25.0.5 to 26.0.7 + +BREAKING CHANGES: +- Keycloak Docker image env var `KEYCLOAK_ADMIN` is replaced by `KC_BOOTSTRAP_ADMIN_USERNAME` +- Keycloak Docker image env var `KEYCLOAK_ADMIN_PASSWORD` is replace by `KC_BOOTSTRAP_ADMIN_PASSWORD` + v 24.11.0 ======== diff --git a/sources/keycloak/Dockerfile.orthanc-keycloak b/sources/keycloak/Dockerfile.orthanc-keycloak index 6585cb2..0916a47 100644 --- a/sources/keycloak/Dockerfile.orthanc-keycloak +++ b/sources/keycloak/Dockerfile.orthanc-keycloak @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: CC0-1.0 -FROM quay.io/keycloak/keycloak:25.0.5 AS builder +FROM quay.io/keycloak/keycloak:26.0.7 AS builder WORKDIR /opt/keycloak ENV KC_DB=postgres @@ -14,7 +14,7 @@ ADD keycloak/orthanc-theme /opt/keycloak/themes/orthanc RUN /opt/keycloak/bin/kc.sh build -FROM quay.io/keycloak/keycloak:25.0.5 +FROM quay.io/keycloak/keycloak:26.0.7 COPY --from=builder /opt/keycloak/ /opt/keycloak/ COPY keycloak/realm-export.json /opt/keycloak/data/import/ diff --git a/sources/keycloak/orthanc-theme/login/theme.properties b/sources/keycloak/orthanc-theme/login/theme.properties index 586939c..30ba51d 100644 --- a/sources/keycloak/orthanc-theme/login/theme.properties +++ b/sources/keycloak/orthanc-theme/login/theme.properties @@ -7,7 +7,7 @@ parent=base import=common/keycloak styles=css/login.css -stylesCommon=node_modules/@patternfly/patternfly/patternfly.min.css node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css lib/pficon/pficon.css +stylesCommon=vendor/patternfly-v4/patternfly.min.css vendor/patternfly-v3/css/patternfly.min.css vendor/patternfly-v3/css/patternfly-additions.min.css lib/pficon/pficon.css meta=viewport==width=device-width,initial-scale=1