From 7aa63fdc875ce84a5a97354a70ead158cecd2cd7 Mon Sep 17 00:00:00 2001
From: dennemark <martin@formfollowsyou.com>
Date: Mon, 28 Oct 2024 10:48:56 +0100
Subject: [PATCH] Update keycloak.yml

Newest version 26.0.2
Postgres version 16

--proxy was deprecated
---proxy-headers=xforwarded is necessary
and for replacement of --proxy=edge also --http-enabled=true

Password naming was changed, too.

https://www.keycloak.org/docs/latest/upgrading/index.html#deprecated-proxy-option
---
 public/v4/apps/keycloak.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/v4/apps/keycloak.yml b/public/v4/apps/keycloak.yml
index 18a09214e..ef8fbba3a 100644
--- a/public/v4/apps/keycloak.yml
+++ b/public/v4/apps/keycloak.yml
@@ -16,8 +16,8 @@ services:
             - $$cap_appname-db
         restart: always
         environment:
-            KEYCLOAK_ADMIN: $$cap_keycloak_admin
-            KEYCLOAK_ADMIN_PASSWORD: $$cap_keycloak_password
+            KC_BOOTSTRAP_ADMIN_USERNAME: $$cap_keycloak_admin
+            KC_BOOTSTRAP_ADMIN_PASSWORD: $$cap_keycloak_password
             KC_DB_PASSWORD: $$cap_pg_pass
         caproverExtra:
             containerHttpPort: '8080'
@@ -36,19 +36,19 @@ services:
                 - ENV KC_DB_USERNAME=keycloak
                 - ENV KC_DB_PASSWORD=$$cap_pg_pass
                 - ENV KC_HOSTNAME=$$cap_appname.$$cap_root_domain
-                - ENTRYPOINT ["/opt/keycloak/bin/kc.sh", "start", "--optimized", "--proxy=edge"]
+                - ENTRYPOINT ["/opt/keycloak/bin/kc.sh", "start", "--optimized",  "--proxy-headers=xforwarded", "--http-enabled=true"]
 
 caproverOneClickApp:
     variables:
         - id: $$cap_postgres_version
           label: Postgres Version
-          defaultValue: '15'
+          defaultValue: '16'
           description: Check out Keycloak DB page for any valid major tested https://www.keycloak.org/server/db
           validRegex: /^([^\s^\/])+$/
         - id: $$cap_keycloak_version
           label: Keycloak Version
-          defaultValue: '23.0.1'
-          description: v23.0.1 current as of 2023-12-06.  Check out Keycloak Docker page for the valid tags https://quay.io/repository/keycloak/keycloak?tab=tags
+          defaultValue: '26.0.2'
+          description: v26.0.2 current as of 2024-10-24.  Check out Keycloak Docker page for the valid tags https://quay.io/repository/keycloak/keycloak?tab=tags
           validRegex: /^([^\s^\/])+$/
         - id: $$cap_pg_pass
           label: Postgres Password