updating keycloak version

Author: adl-trey

.gitignore

@@ -2,3 +2,7 @@
 /scratch/
 /adl-lem/resolver/package-lock.json
 /adl-lem/mom-helper
+
+global.env
+**/local.env
+**/.env

adl-auth/docker-compose.yml

@@ -58,14 +58,19 @@ services:
       - postgres:docker_postgres
     environment:
       PROXY_ADDRESS_FORWARDING: "true"
-      DB_VENDOR: POSTGRES
-      DB_ADDR: postgres
-      DB_DATABASE: ${POSTGRES_DB}
-      DB_SCHEMA: public
-      DB_USER: ${POSTGRES_USER}
-      DB_PASSWORD: ${POSTGRES_PASSWORD}
-      KEYCLOAK_USER: ${KEYCLOAK_USER}
-      KEYCLOAK_PASSWORD: ${KEYCLOAK_PASSWORD}
+      KEYCLOAK_ADMIN: ${KEYCLOAK_USER}
+      KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_PASSWORD}
+      KC_DB: postgres
+      KC_DB_URL: jdbc:postgresql://postgres:5432/${POSTGRES_DB}
+      KC_DB_USERNAME: ${POSTGRES_USER}
+      KC_DB_PASSWORD: ${POSTGRES_PASSWORD}
+      KC_DB_SCHEMA: public
+      KC_HOSTNAME: ${HOSTNAME}
+      KC_HOSTNAME_STRICT: "false"
+      KC_HTTP_ENABLED: "true"
+      KC_METRICS_ENABLED: "true"
+      KC_PROXY: "edge"
+      # KC_FEATURES: token-exchange
     networks:
       - public
 

adl-auth/keycloak/Dockerfile

@@ -1,4 +1,31 @@
-FROM quay.io/keycloak/keycloak:16.1.1
+ARG KC_VERSION=20.0
 
-COPY themes/. /opt/jboss/keycloak/themes/
-COPY deployments/. /opt/jboss/keycloak/standalone/deployments/
+# Builder Setup
+#
+# The newer Keycloak images (17+) recommend building Keycloak within
+# a separate image and then moving the built service into a runner image.
+# This removes the lengthy startup process that Keycloak has famously
+# needed to perform after each restart, but does add an additional step
+# to the Dockerfile.
+#
+FROM quay.io/keycloak/keycloak:${KC_VERSION} as builder
+
+RUN /opt/keycloak/bin/kc.sh build
+
+# Runner Setup
+#
+# Once the image is built, we can drop in the themes and other plugins
+# directly into this image.
+#
+# Note that the /deployments folder has been renamed to /providers
+#
+FROM quay.io/keycloak/keycloak:${KC_VERSION}
+
+COPY --from=builder /opt/keycloak/lib/quarkus/ /opt/keycloak/lib/quarkus/
+COPY themes/. /opt/keycloak/themes/
+COPY deployments/. /opt/keycloak/providers/
+
+WORKDIR /opt/keycloak
+
+
+ENTRYPOINT ["/opt/keycloak/bin/kc.sh", "start", "--http-relative-path", "/auth"]