From f9c22c23b3a626b7321b6443da19c3fea1e6e170 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 16 Feb 2024 12:29:36 +0100
Subject: [PATCH] [bitnami/mariadb] Release 10.11.7-debian-11-r14 (#61711)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/mariadb/10.11/debian-11/Dockerfile                  | 4 ++--
 .../debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh     | 1 +
 .../rootfs/opt/bitnami/scripts/mariadb/entrypoint.sh        | 6 ++++++
 .../rootfs/opt/bitnami/scripts/mariadb/postunpack.sh        | 6 +++++-
 bitnami/mariadb/README.md                                   | 1 +
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bitnami/mariadb/10.11/debian-11/Dockerfile b/bitnami/mariadb/10.11/debian-11/Dockerfile
index 641db9d1facb..6da8d21ac1d3 100644
--- a/bitnami/mariadb/10.11/debian-11/Dockerfile
+++ b/bitnami/mariadb/10.11/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2024-02-15T08:57:34Z" \
+      org.opencontainers.image.created="2024-02-16T10:40:17Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.11.7-debian-11-r13" \
+      org.opencontainers.image.ref.name="10.11.7-debian-11-r14" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.11.7"
diff --git a/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh b/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh
index 8f26b75fc70c..5a226f21476f 100644
--- a/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh
+++ b/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh
@@ -81,6 +81,7 @@ export DB_DATA_DIR="${DB_VOLUME_DIR}/data"
 export DB_BIN_DIR="${DB_BASE_DIR}/bin"
 export DB_SBIN_DIR="${DB_BASE_DIR}/sbin"
 export DB_CONF_DIR="${DB_BASE_DIR}/conf"
+export DB_DEFAULT_CONF_DIR="${DB_BASE_DIR}/conf.default"
 export DB_LOGS_DIR="${DB_BASE_DIR}/logs"
 export DB_TMP_DIR="${DB_BASE_DIR}/tmp"
 export DB_CONF_FILE="${DB_CONF_DIR}/my.cnf"
diff --git a/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb/entrypoint.sh b/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb/entrypoint.sh
index 7da38021232c..2778b418f2fd 100755
--- a/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb/entrypoint.sh
+++ b/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb/entrypoint.sh
@@ -18,6 +18,12 @@ set -o pipefail
 
 print_welcome_page
 
+# We add the copy from default config in the entrypoint to not break users 
+# bypassing the setup.sh logic. If the file already exists do not overwrite (in
+# case someone mounts a configuration file in /opt/bitnami/mariadb/conf)
+debug "Copying files from $DB_DEFAULT_CONF_DIR to $DB_CONF_DIR"
+cp -nr "$DB_DEFAULT_CONF_DIR"/. "$DB_CONF_DIR"
+
 if [[ "$1" = "/opt/bitnami/scripts/mariadb/run.sh" ]]; then
     info "** Starting MariaDB setup **"
     /opt/bitnami/scripts/mariadb/setup.sh
diff --git a/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb/postunpack.sh b/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb/postunpack.sh
index 775f4d912407..98108424f464 100755
--- a/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb/postunpack.sh
+++ b/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb/postunpack.sh
@@ -21,7 +21,7 @@ info "Configuring default MariaDB options"
 ensure_dir_exists "$DB_CONF_DIR"
 mysql_create_default_config
 
-for dir in "$DB_TMP_DIR" "$DB_LOGS_DIR" "$DB_CONF_DIR" "${DB_CONF_DIR}/bitnami" "$DB_VOLUME_DIR" "$DB_DATA_DIR"; do
+for dir in "$DB_TMP_DIR" "$DB_LOGS_DIR" "$DB_CONF_DIR" "$DB_DEFAULT_CONF_DIR" "${DB_CONF_DIR}/bitnami" "$DB_VOLUME_DIR" "$DB_DATA_DIR"; do
     ensure_dir_exists "$dir"
     chmod -R g+rwX "$dir"
 done
@@ -31,3 +31,7 @@ ln -sf "$DB_BASE_DIR/plugin" "$DB_BASE_DIR/lib/plugin"
 
 # Redirect all logging to stdout
 ln -sf "/proc/1/fd/1" "$DB_LOGS_DIR/mysqld.log"
+
+# Copy all initially generated configuration files to the default directory
+# (this is to avoid breaking when entrypoint is being overridden)
+cp -r "${DB_CONF_DIR}/"* "$DB_DEFAULT_CONF_DIR"
diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md
index 5c224d5ba00c..902e4ab9b876 100644
--- a/bitnami/mariadb/README.md
+++ b/bitnami/mariadb/README.md
@@ -199,6 +199,7 @@ docker-compose up -d
 | `DB_BIN_DIR`                    | MariaDB directory where executable binary files are located. | `${DB_BASE_DIR}/bin`            |
 | `DB_SBIN_DIR`                   | MariaDB directory where service binary files are located.    | `${DB_BASE_DIR}/sbin`           |
 | `DB_CONF_DIR`                   | MariaDB configuration directory.                             | `${DB_BASE_DIR}/conf`           |
+| `DB_DEFAULT_CONF_DIR`           | MariaDB default configuration directory.                     | `${DB_BASE_DIR}/conf.default`   |
 | `DB_LOGS_DIR`                   | MariaDB logs directory.                                      | `${DB_BASE_DIR}/logs`           |
 | `DB_TMP_DIR`                    | MariaDB directory for temporary files.                       | `${DB_BASE_DIR}/tmp`            |
 | `DB_CONF_FILE`                  | Main MariaDB configuration file.                             | `${DB_CONF_DIR}/my.cnf`         |