From 4cc0091ff187f688518478e64ee35c744112e50d Mon Sep 17 00:00:00 2001
From: Garth <244253+xgp@users.noreply.github.com>
Date: Tue, 14 Jan 2025 15:47:39 +0100
Subject: [PATCH] 26.0.8 kc and 0.83 orgs bump

---
 .github/workflows/release.yml | 4 ++--
 Dockerfile                    | 4 ++--
 docker-compose.yml            | 8 +++-----
 libs/pom.xml                  | 4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 45498df..402d7ad 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,10 +6,10 @@ on:
       - main
 
 env:
-  # Version 26.0.7
+  # Version 26.0.8
   VERSION_MAJOR: 26
   VERSION_SUBMAJOR: 0
-  VERSION_MINOR: 7
+  VERSION_MINOR: 8
 
 jobs:
   release-public:
diff --git a/Dockerfile b/Dockerfile
index 2aa3ac1..470f1a2 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/phasetwo/keycloak-crdb:26.0.7 as builder
+FROM quay.io/phasetwo/keycloak-crdb:26.0.8 as builder
 
 ENV KC_METRICS_ENABLED=true
 ENV KC_HEALTH_ENABLED=true
@@ -17,7 +17,7 @@ COPY ./libs/target/container*/*.jar /opt/keycloak/providers/
 
 RUN /opt/keycloak/bin/kc.sh --verbose build --spi-email-template-provider=freemarker-plus-mustache --spi-email-template-freemarker-plus-mustache-enabled=true --spi-theme-cache-themes=false
 
-FROM quay.io/phasetwo/keycloak-crdb:26.0.7
+FROM quay.io/phasetwo/keycloak-crdb:26.0.8
 
 #USER root
 # remediation for vulnerabilities
diff --git a/docker-compose.yml b/docker-compose.yml
index fd05def..fdf599b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,10 +20,8 @@ services:
       KC_DB: cockroach
       KC_HTTP_RELATIVE_PATH: /auth
       PROXY_ADDRESS_FORWARDING: 'true'
-      KEYCLOAK_USER: admin
-      KEYCLOAK_PASSWORD: admin
-      KEYCLOAK_ADMIN: admin
-      KEYCLOAK_ADMIN_PASSWORD: admin
+      KC_BOOTSTRAP_ADMIN_USERNAME: admin
+      KC_BOOTSTRAP_ADMIN_PASSWORD: admin
       KC_CACHE_CONFIG_FILE: cache-ispn-jdbc-ping.xml
       KC_DB_PASSWORD: ''
       KC_DB_SCHEMA: public
@@ -40,7 +38,7 @@ services:
       KC_ISPN_DB_VENDOR: cockroachdb
       KC_LOG_LEVEL: "INFO,io.phasetwo:DEBUG"
       KC_METRICS_ENABLED: true
-      KC_PROXY_HEADERS: 'edge'
+      KC_PROXY_HEADERS: 'xforwarded'
       KC_TRANSACTION_JTA_ENABLED: 'false'
       KC_TRANSACTION_XA_ENABLED: 'false'
     ports:
diff --git a/libs/pom.xml b/libs/pom.xml
index 7947674..f28169b 100644
--- a/libs/pom.xml
+++ b/libs/pom.xml
@@ -20,10 +20,10 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <keycloak.version>26.0.7</keycloak.version>
+    <keycloak.version>26.0.8</keycloak.version>
     <keycloak-events.version>0.39</keycloak-events.version>
     <keycloak-magic-link.version>0.33</keycloak-magic-link.version>
-    <keycloak-orgs.version>0.82</keycloak-orgs.version>
+    <keycloak-orgs.version>0.83</keycloak-orgs.version>
     <keycloak-themes.version>0.36</keycloak-themes.version>
     <phasetwo-admin-portal.version>0.34</phasetwo-admin-portal.version>
     <phasetwo-idp-wizard.version>0.15</phasetwo-idp-wizard.version>