From d18e69fa13e6bc74a5b9e2e0287b1478d13e2a4c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Sat, 26 Mar 2022 01:40:01 +0000
Subject: [PATCH] 10.5.15-debian-10-r38 release

---
 bitnami/mariadb/10.5/debian-10/Dockerfile                     | 2 +-
 .../debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh  | 4 ----
 .../10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh   | 3 ++-
 .../10.5/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh  | 1 +
 bitnami/mariadb/README.md                                     | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/bitnami/mariadb/10.5/debian-10/Dockerfile b/bitnami/mariadb/10.5/debian-10/Dockerfile
index 8846fdbe2013..8ac8b258a843 100644
--- a/bitnami/mariadb/10.5/debian-10/Dockerfile
+++ b/bitnami/mariadb/10.5/debian-10/Dockerfile
@@ -21,7 +21,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/mariadb/postunpack.sh
 ENV APP_VERSION="10.5.15" \
     BITNAMI_APP_NAME="mariadb" \
-    BITNAMI_IMAGE_VERSION="10.5.15-debian-10-r37" \
+    BITNAMI_IMAGE_VERSION="10.5.15-debian-10-r38" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH"
 
 EXPOSE 3306
diff --git a/bitnami/mariadb/10.5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/mariadb/10.5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 503650210583..818c2158032b 100644
--- a/bitnami/mariadb/10.5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/mariadb/10.5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -392,10 +392,6 @@ web_server_update_app_configuration() {
             --hosts \
             | --server-name \
             | --server-aliases \
-            | --enable-http \
-            | --enable-https \
-            | --disable-http \
-            | --disable-https \
             | --http-port \
             | --https-port \
             )
diff --git a/bitnami/mariadb/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh
index 3b1ba0277d54..ad6ca69bc80a 100644
--- a/bitnami/mariadb/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh
+++ b/bitnami/mariadb/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh
@@ -2,7 +2,7 @@
 #
 # Bitnami MySQL library
 
-# shellcheck disable=SC1090,SC1091
+# shellcheck disable=SC1090,SC1091,SC2119,SC2120
 
 # Load Generic Libraries
 . /opt/bitnami/scripts/libfile.sh
@@ -25,6 +25,7 @@
 mysql_extra_flags() {
     local randNumber
     local -a dbExtraFlags=()
+    # shellcheck disable=SC2153
     read -r -a userExtraFlags <<< "$DB_EXTRA_FLAGS"
 
     if [[ -n "$DB_REPLICATION_MODE" ]]; then
diff --git a/bitnami/mariadb/10.5/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh b/bitnami/mariadb/10.5/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh
index 9abca189f0f2..5590c11c17d9 100644
--- a/bitnami/mariadb/10.5/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh
+++ b/bitnami/mariadb/10.5/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh
@@ -9,6 +9,7 @@
 # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata)
 
 # Load logging library
+# shellcheck disable=SC1090,SC1091
 . /opt/bitnami/scripts/liblog.sh
 
 export BITNAMI_ROOT_DIR="/opt/bitnami"
diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md
index 2d9997cc5c3b..593778cfe18f 100644
--- a/bitnami/mariadb/README.md
+++ b/bitnami/mariadb/README.md
@@ -52,7 +52,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`10.7`, `10.7-debian-10`, `10.7.3`, `10.7.3-debian-10-r7`, `latest` (10.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.7.3-debian-10-r7/10.7/debian-10/Dockerfile)
 * [`10.6`, `10.6-debian-10`, `10.6.7`, `10.6.7-debian-10-r37` (10.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.6.7-debian-10-r37/10.6/debian-10/Dockerfile)
-* [`10.5`, `10.5-debian-10`, `10.5.15`, `10.5.15-debian-10-r37` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.5.15-debian-10-r37/10.5/debian-10/Dockerfile)
+* [`10.5`, `10.5-debian-10`, `10.5.15`, `10.5.15-debian-10-r38` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.5.15-debian-10-r38/10.5/debian-10/Dockerfile)
 * [`10.4`, `10.4-debian-10`, `10.4.24`, `10.4.24-debian-10-r38` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.4.24-debian-10-r38/10.4/debian-10/Dockerfile)
 * [`10.3`, `10.3-debian-10`, `10.3.34`, `10.3.34-debian-10-r39` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.34-debian-10-r39/10.3/debian-10/Dockerfile)
 * [`10.2`, `10.2-debian-10`, `10.2.43`, `10.2.43-debian-10-r37` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.2.43-debian-10-r37/10.2/debian-10/Dockerfile)