update deprecated keycloak admin deprecated env variables: https://ww…

…w.keycloak.org/docs/26.0.6/upgrading/#external-infinispan-in-a-single-site-setup Signed-off-by: Mathias Beaulieu-Duncan <[email protected]>
bitnami · Nov 27, 2024 · 5033367 · 5033367
1 parent 15a305b
commit 5033367
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/bitnami/keycloak/25/debian-12/rootfs/opt/bitnami/scripts/keycloak-env.sh b/bitnami/keycloak/25/debian-12/rootfs/opt/bitnami/scripts/keycloak-env.sh
@@ -26,8 +26,8 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
 keycloak_env_vars=(
     KEYCLOAK_MOUNTED_CONF_DIR
     KC_RUN_IN_CONTAINER
-    KEYCLOAK_ADMIN
-    KEYCLOAK_ADMIN_PASSWORD
+    KC_BOOTSTRAP_ADMIN_USERNAME
+    KC_BOOTSTRAP_ADMIN_PASSWORD
     KEYCLOAK_HTTP_RELATIVE_PATH
     KEYCLOAK_HTTP_PORT
     KEYCLOAK_HTTPS_PORT
@@ -127,9 +127,9 @@ export KEYCLOAK_DEFAULT_CONF_FILE="keycloak.conf"
 export KC_RUN_IN_CONTAINER="${KC_RUN_IN_CONTAINER:-true}"
 
 # Keycloak configuration
-KEYCLOAK_ADMIN="${KEYCLOAK_ADMIN:-"${KEYCLOAK_ADMIN_USER:-}"}"
-export KEYCLOAK_ADMIN="${KEYCLOAK_ADMIN:-user}"
-export KEYCLOAK_ADMIN_PASSWORD="${KEYCLOAK_ADMIN_PASSWORD:-bitnami}"
+KC_BOOTSTRAP_ADMIN_USERNAME="${KC_BOOTSTRAP_ADMIN_USERNAME:-"${KEYCLOAK_ADMIN_USER:-}"}"
+export KC_BOOTSTRAP_ADMIN_USERNAME="${KC_BOOTSTRAP_ADMIN_USERNAME:-user}"
+export KC_BOOTSTRAP_ADMIN_PASSWORD="${KC_BOOTSTRAP_ADMIN_PASSWORD:-bitnami}"
 export KEYCLOAK_HTTP_RELATIVE_PATH="${KEYCLOAK_HTTP_RELATIVE_PATH:-/}"
 export KEYCLOAK_HTTP_PORT="${KEYCLOAK_HTTP_PORT:-8080}"
 export KEYCLOAK_HTTPS_PORT="${KEYCLOAK_HTTPS_PORT:-8443}"

diff --git a/bitnami/keycloak/25/debian-12/rootfs/opt/bitnami/scripts/keycloak/postunpack.sh b/bitnami/keycloak/25/debian-12/rootfs/opt/bitnami/scripts/keycloak/postunpack.sh
@@ -17,7 +17,7 @@ set -o pipefail
 # Load keycloak environment variables
 . /opt/bitnami/scripts/keycloak-env.sh
 
-ensure_user_exists "$KEYCLOAK_ADMIN"
+ensure_user_exists "$KC_BOOTSTRAP_ADMIN_USERNAME"
 ensure_user_exists "$KEYCLOAK_DAEMON_USER" --group "$KEYCLOAK_DAEMON_GROUP"
 
 for dir in "$KEYCLOAK_LOG_DIR" "$KEYCLOAK_TMP_DIR" "$KEYCLOAK_VOLUME_DIR" "$KEYCLOAK_CONF_DIR" "$KEYCLOAK_DEFAULT_CONF_DIR" "$KEYCLOAK_INITSCRIPTS_DIR" "${KEYCLOAK_BASE_DIR}/.installation" "${KEYCLOAK_BASE_DIR}/data" "${KEYCLOAK_BASE_DIR}/lib" "$KEYCLOAK_BASE_DIR" "$KEYCLOAK_PROVIDERS_DIR"; do

diff --git a/bitnami/keycloak/26/debian-12/rootfs/opt/bitnami/scripts/keycloak-env.sh b/bitnami/keycloak/26/debian-12/rootfs/opt/bitnami/scripts/keycloak-env.sh
@@ -26,8 +26,8 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
 keycloak_env_vars=(
     KEYCLOAK_MOUNTED_CONF_DIR
     KC_RUN_IN_CONTAINER
-    KEYCLOAK_ADMIN
-    KEYCLOAK_ADMIN_PASSWORD
+    KC_BOOTSTRAP_ADMIN_USERNAME
+    KC_BOOTSTRAP_ADMIN_PASSWORD
     KEYCLOAK_HTTP_RELATIVE_PATH
     KEYCLOAK_HTTP_PORT
     KEYCLOAK_HTTPS_PORT
@@ -127,9 +127,9 @@ export KEYCLOAK_DEFAULT_CONF_FILE="keycloak.conf"
 export KC_RUN_IN_CONTAINER="${KC_RUN_IN_CONTAINER:-true}"
 
 # Keycloak configuration
-KEYCLOAK_ADMIN="${KEYCLOAK_ADMIN:-"${KEYCLOAK_ADMIN_USER:-}"}"
-export KEYCLOAK_ADMIN="${KEYCLOAK_ADMIN:-user}"
-export KEYCLOAK_ADMIN_PASSWORD="${KEYCLOAK_ADMIN_PASSWORD:-bitnami}"
+KC_BOOTSTRAP_ADMIN_USERNAME="${KC_BOOTSTRAP_ADMIN_USERNAME:-"${KEYCLOAK_ADMIN_USER:-}"}"
+export KC_BOOTSTRAP_ADMIN_USERNAME="${KC_BOOTSTRAP_ADMIN_USERNAME:-user}"
+export KC_BOOTSTRAP_ADMIN_PASSWORD="${KC_BOOTSTRAP_ADMIN_PASSWORD:-bitnami}"
 export KEYCLOAK_HTTP_RELATIVE_PATH="${KEYCLOAK_HTTP_RELATIVE_PATH:-/}"
 export KEYCLOAK_HTTP_PORT="${KEYCLOAK_HTTP_PORT:-8080}"
 export KEYCLOAK_HTTPS_PORT="${KEYCLOAK_HTTPS_PORT:-8443}"

diff --git a/bitnami/keycloak/26/debian-12/rootfs/opt/bitnami/scripts/keycloak/postunpack.sh b/bitnami/keycloak/26/debian-12/rootfs/opt/bitnami/scripts/keycloak/postunpack.sh
@@ -17,7 +17,7 @@ set -o pipefail
 # Load keycloak environment variables
 . /opt/bitnami/scripts/keycloak-env.sh
 
-ensure_user_exists "$KEYCLOAK_ADMIN"
+ensure_user_exists "$KC_BOOTSTRAP_ADMIN_USERNAME"
 ensure_user_exists "$KEYCLOAK_DAEMON_USER" --group "$KEYCLOAK_DAEMON_GROUP"
 
 for dir in "$KEYCLOAK_LOG_DIR" "$KEYCLOAK_TMP_DIR" "$KEYCLOAK_VOLUME_DIR" "$KEYCLOAK_CONF_DIR" "$KEYCLOAK_DEFAULT_CONF_DIR" "$KEYCLOAK_INITSCRIPTS_DIR" "${KEYCLOAK_BASE_DIR}/.installation" "${KEYCLOAK_BASE_DIR}/data" "${KEYCLOAK_BASE_DIR}/lib" "$KEYCLOAK_BASE_DIR" "$KEYCLOAK_PROVIDERS_DIR"; do

diff --git a/bitnami/keycloak/README.md b/bitnami/keycloak/README.md
@@ -74,8 +74,8 @@ docker build -t bitnami/APP:latest .
 |-------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|-------------------------------|
 | `KEYCLOAK_MOUNTED_CONF_DIR`                                 | Directory for including custom configuration files (that override the default generated ones)         | `${KEYCLOAK_VOLUME_DIR}/conf` |
 | `KC_RUN_IN_CONTAINER`                                       | Keycloak kc.sh context                                                                                | `true`                        |
-| `KEYCLOAK_ADMIN`                                            | Keycloak administrator user                                                                           | `user`                        |
-| `KEYCLOAK_ADMIN_PASSWORD`                                   | Keycloak administrator password                                                                       | `bitnami`                     |
+| `KC_BOOTSTRAP_ADMIN_USERNAME`                                            | Keycloak administrator user                                                                           | `user`                        |
+| `KC_BOOTSTRAP_ADMIN_PASSWORD`                                   | Keycloak administrator password                                                                       | `bitnami`                     |
 | `KEYCLOAK_HTTP_RELATIVE_PATH`                               | Set the path relative to "/" for serving resources.                                                   | `/`                           |
 | `KEYCLOAK_HTTP_PORT`                                        | HTTP port                                                                                             | `8080`                        |
 | `KEYCLOAK_HTTPS_PORT`                                       | HTTPS port                                                                                            | `8443`                        |