From f363a04f679fe0ddd480f877a2eff964c8ca5909 Mon Sep 17 00:00:00 2001 From: TomJKing Date: Fri, 29 Nov 2024 09:21:47 +0000 Subject: [PATCH 1/3] Upgrade to version 25 --- .github/workflows/build.yml | 2 +- Dockerfile | 4 ++-- keycloak.conf | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a91613ae..476c1fd2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: with: repo-name: tdr-auth-server image-name: auth-server - java-version: '17' + java-version: '21' build-command: | npm install npm run build-theme diff --git a/Dockerfile b/Dockerfile index fbab5804..64dd11e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM quay.io/keycloak/keycloak:26.0.6 as builder +FROM quay.io/keycloak/keycloak:25.0.0 as builder FROM registry.access.redhat.com/ubi9-minimal COPY --from=builder /opt/keycloak/ /opt/keycloak/ USER root RUN microdnf update -y && \ - microdnf -y install python3 java-17-openjdk-headless shadow-utils + microdnf -y install python3 java-21-openjdk-headless shadow-utils RUN useradd -U keycloak WORKDIR /opt/keycloak RUN mkdir /keycloak-configuration diff --git a/keycloak.conf b/keycloak.conf index b3fa1fdc..1c9a2ba8 100644 --- a/keycloak.conf +++ b/keycloak.conf @@ -1,5 +1,6 @@ hostname=${KEYCLOAK_HOST} proxy=edge +http-enabled=true log-console-output=json spi-events-listener-jboss-logging-success-level=info spi-events-listener-jboss-logging-error-level=warn From e1585f48f81431097b4a3c05744df00f4b497cce Mon Sep 17 00:00:00 2001 From: TomJKing Date: Mon, 2 Dec 2024 08:21:38 +0000 Subject: [PATCH 2/3] Allow for dynamic resolution of backend URLs Keycloak restart failing to get to a 'healthy' state following upgrade This may resolve this following the changes to Keycloaks hostname strategy: https://www.keycloak.org/docs/latest/upgrading/#migrating-to-25-0-0 --- keycloak.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/keycloak.conf b/keycloak.conf index 1c9a2ba8..c5fc96e6 100644 --- a/keycloak.conf +++ b/keycloak.conf @@ -10,3 +10,4 @@ spi-events-listener-event-publisher-enabled=true spi-events-listener-jboss-logging-enabled=true features=client-secret-rotation,admin-fine-grained-authz health-enabled=true +hostname-backchannel-dynamic=true From 5a7d48807d07a263898b9e01e448adfff2d20432 Mon Sep 17 00:00:00 2001 From: TomJKing Date: Mon, 2 Dec 2024 11:16:29 +0000 Subject: [PATCH 3/3] fix this --- keycloak.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/keycloak.conf b/keycloak.conf index c5fc96e6..1c9a2ba8 100644 --- a/keycloak.conf +++ b/keycloak.conf @@ -10,4 +10,3 @@ spi-events-listener-event-publisher-enabled=true spi-events-listener-jboss-logging-enabled=true features=client-secret-rotation,admin-fine-grained-authz health-enabled=true -hostname-backchannel-dynamic=true