From 600e56ca07a834e1f9742e7f6207816d3f013d56 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Sat, 6 May 2023 09:36:33 +0100
Subject: [PATCH] [bitnami/mariadb-galera] Release 10.3.38-debian-11-r26
 (#32888)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/mariadb-galera/10.3/debian-11/Dockerfile      |  7 +++----
 .../debian-11/prebuildfs/opt/bitnami/scripts/libos.sh | 11 ++++++++---
 .../rootfs/opt/bitnami/scripts/mariadb-env.sh         |  3 +++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/bitnami/mariadb-galera/10.3/debian-11/Dockerfile b/bitnami/mariadb-galera/10.3/debian-11/Dockerfile
index 5acfc6101f75..af1bc00ab3ff 100644
--- a/bitnami/mariadb-galera/10.3/debian-11/Dockerfile
+++ b/bitnami/mariadb-galera/10.3/debian-11/Dockerfile
@@ -2,12 +2,11 @@ FROM docker.io/bitnami/minideb:bullseye
 
 ARG TARGETARCH
 
-LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \
-      org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-05-03T07:59:17Z" \
+LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-05-06T08:18:49Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.3.38-debian-11-r25" \
+      org.opencontainers.image.ref.name="10.3.38-debian-11-r26" \
       org.opencontainers.image.title="mariadb-galera" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.3.38"
diff --git a/bitnami/mariadb-galera/10.3/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/mariadb-galera/10.3/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index e573899abacb..02c989d693ae 100644
--- a/bitnami/mariadb-galera/10.3/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/mariadb-galera/10.3/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -412,11 +412,16 @@ generate_random_string() {
     ascii)
         filter="[:print:]"
         ;;
+    numeric)
+        filter="0-9"
+        ;;
     alphanumeric)
         filter="a-zA-Z0-9"
         ;;
-    numeric)
-        filter="0-9"
+    alphanumeric+special|special+alphanumeric)
+        # Limit variety of special characters, so there is a higher chance of containing more alphanumeric characters
+        # Special characters are harder to write, and it could impact the overall UX if most passwords are too complex
+        filter='a-zA-Z0-9!@#$%^'
         ;;
     *)
         echo "Invalid type ${type}" >&2
@@ -647,4 +652,4 @@ run_chroot() {
     else
         chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@"
     fi
-}
\ No newline at end of file
+}
diff --git a/bitnami/mariadb-galera/10.3/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh b/bitnami/mariadb-galera/10.3/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh
index f5aca4107089..2ec9ecc8a07f 100644
--- a/bitnami/mariadb-galera/10.3/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh
+++ b/bitnami/mariadb-galera/10.3/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh
@@ -33,6 +33,7 @@ mariadb_env_vars=(
     MARIADB_MASTER_PORT_NUMBER
     MARIADB_MASTER_ROOT_USER
     MARIADB_MASTER_ROOT_PASSWORD
+    MARIADB_MASTER_DELAY
     MARIADB_REPLICATION_USER
     MARIADB_REPLICATION_PASSWORD
     MARIADB_PORT_NUMBER
@@ -138,6 +139,8 @@ export MARIADB_MASTER_ROOT_USER="${MARIADB_MASTER_ROOT_USER:-root}"
 export DB_MASTER_ROOT_USER="$MARIADB_MASTER_ROOT_USER" # only used during the first initialization
 export MARIADB_MASTER_ROOT_PASSWORD="${MARIADB_MASTER_ROOT_PASSWORD:-}"
 export DB_MASTER_ROOT_PASSWORD="$MARIADB_MASTER_ROOT_PASSWORD" # only used during the first initialization
+export MARIADB_MASTER_DELAY="${MARIADB_MASTER_DELAY:-0}"
+export DB_MASTER_DELAY="$MARIADB_MASTER_DELAY" # only used during the first initialization
 export MARIADB_REPLICATION_USER="${MARIADB_REPLICATION_USER:-}"
 export DB_REPLICATION_USER="$MARIADB_REPLICATION_USER" # only used during the first initialization
 export MARIADB_REPLICATION_PASSWORD="${MARIADB_REPLICATION_PASSWORD:-}"