From 2920eb5b482ed185f1847747fd14d85537004d07 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 2 Jul 2024 19:20:35 +0200
Subject: [PATCH] [bitnami/mariadb] Release 10.6.18-debian-12-r4 (#68578)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/mariadb/10.6/debian-12/Dockerfile                 | 8 ++++----
 .../prebuildfs/opt/bitnami/.bitnami_components.json       | 4 ++--
 .../debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh    | 3 ++-
 .../debian-12/rootfs/opt/bitnami/scripts/mariadb-env.sh   | 3 +++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bitnami/mariadb/10.6/debian-12/Dockerfile b/bitnami/mariadb/10.6/debian-12/Dockerfile
index 709394a17d46..4f65a61e19da 100644
--- a/bitnami/mariadb/10.6/debian-12/Dockerfile
+++ b/bitnami/mariadb/10.6/debian-12/Dockerfile
@@ -7,11 +7,11 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-07-01T14:28:41Z" \
+      org.opencontainers.image.created="2024-07-02T16:06:17Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mariadb/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.6.18-debian-12-r3" \
+      org.opencontainers.image.ref.name="10.6.18-debian-12-r4" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mariadb" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -28,8 +28,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu72 liblzma5 libncurses6 libpam0g libssl3 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "ini-file-1.4.6-14-linux-${OS_ARCH}-debian-12" \
-      "mariadb-10.6.18-1-linux-${OS_ARCH}-debian-12" \
+      "ini-file-1.4.7-0-linux-${OS_ARCH}-debian-12" \
+      "mariadb-10.6.18-2-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/mariadb/10.6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/10.6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 514599bc201e..d230c5024320 100644
--- a/bitnami/mariadb/10.6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mariadb/10.6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,12 +3,12 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.4.6-14"
+        "version": "1.4.7-0"
     },
     "mariadb": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "10.6.18-1"
+        "version": "10.6.18-2"
     }
 }
\ No newline at end of file
diff --git a/bitnami/mariadb/10.6/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.6/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh
index 792561ac08af..bbc88ffd4421 100644
--- a/bitnami/mariadb/10.6/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh
+++ b/bitnami/mariadb/10.6/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh
@@ -357,7 +357,7 @@ mysql_initialize() {
         # commands can still be executed until we restart or run 'flush privileges'
         info "Configuring authentication"
         mysql_execute "mysql" <<EOF
-DELETE FROM mysql.user WHERE user not in ('mysql.sys','mariadb.sys');
+DELETE FROM mysql.user WHERE user not in ('mysql.sys','mysql.infoschema','mysql.session','mariadb.sys');
 EOF
         # slaves do not need to configure users
         if [[ -z "$DB_REPLICATION_MODE" ]] || [[ "$DB_REPLICATION_MODE" = "master" ]]; then
@@ -529,6 +529,7 @@ mariadb_upgrade() {
     info "Running mysql_upgrade"
     mysql_start_bg
     is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("-p$(get_master_env_var_value ROOT_PASSWORD)")
+    [[ "${DB_UPGRADE}" == "FORCE" ]] && args+=("--force")
     debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" || echo "This installation is already upgraded"
 }
 
diff --git a/bitnami/mariadb/10.6/debian-12/rootfs/opt/bitnami/scripts/mariadb-env.sh b/bitnami/mariadb/10.6/debian-12/rootfs/opt/bitnami/scripts/mariadb-env.sh
index 15c125326334..3fe87ab87509 100644
--- a/bitnami/mariadb/10.6/debian-12/rootfs/opt/bitnami/scripts/mariadb-env.sh
+++ b/bitnami/mariadb/10.6/debian-12/rootfs/opt/bitnami/scripts/mariadb-env.sh
@@ -47,6 +47,7 @@ mariadb_env_vars=(
     MARIADB_COLLATE
     MARIADB_BIND_ADDRESS
     MARIADB_SQL_MODE
+    MARIADB_UPGRADE
     MARIADB_SKIP_TEST_DB
     MARIADB_CLIENT_ENABLE_SSL
     MARIADB_CLIENT_SSL_CA_FILE
@@ -151,6 +152,8 @@ export MARIADB_BIND_ADDRESS="${MARIADB_BIND_ADDRESS:-}"
 export DB_BIND_ADDRESS="$MARIADB_BIND_ADDRESS"
 export MARIADB_SQL_MODE="${MARIADB_SQL_MODE:-}"
 export DB_SQL_MODE="$MARIADB_SQL_MODE"
+export MARIADB_UPGRADE="${MARIADB_UPGRADE:-AUTO}"
+export DB_UPGRADE="$MARIADB_UPGRADE"
 export MARIADB_SKIP_TEST_DB="${MARIADB_SKIP_TEST_DB:-no}"
 export DB_SKIP_TEST_DB="$MARIADB_SKIP_TEST_DB"
 export MARIADB_CLIENT_ENABLE_SSL="${MARIADB_CLIENT_ENABLE_SSL:-no}"