Merge branch 'master' into scala-steward-dependencies

nationalarchives · Dec 16, 2024 · 1db1f28 · 1db1f28
2 parents e0ac70f + 9862da6
commit 1db1f28
Show file tree

Hide file tree

Showing 8 changed files with 894 additions and 522 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/keycloak/keycloak:25.0.4 as builder
+FROM quay.io/keycloak/keycloak:26.0.7 as builder
 FROM registry.access.redhat.com/ubi9-minimal
 COPY --from=builder /opt/keycloak/ /opt/keycloak/
 USER root

diff --git a/Dockerfile-update b/Dockerfile-update
@@ -1,4 +1,4 @@
-FROM python:3.13.0-alpine3.19
+FROM python:3.13.1-alpine3.19
 RUN pip install requests
 RUN apk update \
     && apk upgrade zlib libtirpc expat openssl libcrypto3 libssl3

diff --git a/README.md b/README.md
@@ -168,7 +168,7 @@ To run, build and test locally:
     * Run the local docker image:
        ```
        [root directory] $ docker run -d --name [some name] -p 8081:8080 \
-       -e KEYCLOAK_ADMIN=admin -e KEYCLOAK_ADMIN_PASSWORD=admin -e KEYCLOAK_IMPORT=/keycloak-configuration/tdr-realm.json \
+       -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -e KEYCLOAK_IMPORT=/keycloak-configuration/tdr-realm.json \
        -e REALM_ADMIN_CLIENT_SECRET=[some value] -e CLIENT_SECRET=[some value] -e BACKEND_CHECKS_CLIENT_SECRET=[some value] \
        -e REPORTING_CLIENT_SECRET=[some value] \
        -e USER_ADMIN_CLIENT_SECRET=[some value] \
@@ -185,8 +185,8 @@ To run, build and test locally:
        -e BLOCK_SHARED_PAGES=false
        [account id].dkr.ecr.[region].amazonaws.com/tdr-auth-server:[your build tag]
        ```
-       * `KEYCLOAK_ADMIN`: root Keycloak username
-       * `KEYCLOAK_ADMIN_PASSWORD`: password for the root Keycloak user
+       * `KC_BOOTSTRAP_ADMIN_USERNAME`: root Keycloak username
+       * `KC_BOOTSTRAP_ADMIN_PASSWORD`: password for the root Keycloak user
        * `KEYCLOAK_IMPORT`: Location of the generated Keycloak TDR realm json file that contains the configuration for the TDR realm
        * `REALM_ADMIN_CLIENT_SECRET`: tdr realm admin client secret value
        * `CLIENT_SECRET`: tdr client secret value

diff --git a/keycloak.conf b/keycloak.conf
@@ -1,5 +1,5 @@
 hostname=${KEYCLOAK_HOST}
-proxy=edge
+proxy-headers=forwarded
 http-enabled=true
 log-console-output=json
 spi-events-listener-jboss-logging-success-level=info
@@ -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
+spi-group-jpa-escape-slashes-in-group-path=true