Merge branch 'master' into scala-steward-dependencies

nationalarchives · Dec 9, 2024 · 08e65bc · 08e65bc
2 parents 767217b + cfd7ad6
commit 08e65bc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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