From c1d57476b4ffd98bf43a808373d981dcee0f6fe4 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 7 Apr 2022 09:36:18 +0000
Subject: [PATCH] 4.1.2-debian-10-r7 release

---
 bitnami/joomla/4/debian-10/Dockerfile                     | 3 +--
 .../rootfs/opt/bitnami/scripts/libmysqlclient.sh          | 8 ++++++--
 bitnami/joomla/README.md                                  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bitnami/joomla/4/debian-10/Dockerfile b/bitnami/joomla/4/debian-10/Dockerfile
index 3c65d517241c..1fad005b9f57 100644
--- a/bitnami/joomla/4/debian-10/Dockerfile
+++ b/bitnami/joomla/4/debian-10/Dockerfile
@@ -21,8 +21,8 @@ RUN apt-get update && apt-get upgrade -y && \
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
-RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/joomla/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
@@ -30,7 +30,6 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     APP_VERSION="4.1.2" \
     BITNAMI_APP_NAME="joomla" \
-    BITNAMI_IMAGE_VERSION="4.1.2-debian-10-r6" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/joomla/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/joomla/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index fee929c4ee1a..bd3d43db6e43 100644
--- a/bitnami/joomla/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/joomla/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -132,10 +132,14 @@ mysql_client_initialize() {
 #   None
 #########################
 mysql_client_wrap_binary_for_ssl() {
-    local -r wrapper_file="${DB_BIN_DIR}/mysql"
+    local wrapper_file="${DB_BIN_DIR}/mysql"
+    # In MySQL Client 10.6, mysql is a link to the mariadb binary
+    if [[ -f "${DB_BIN_DIR}/mariadb" ]]; then
+        wrapper_file="${DB_BIN_DIR}/mariadb"
+    fi
     local -r wrapped_binary_file="${DB_BASE_DIR}/.bin/mysql"
     local -a ssl_opts=()
-    read -r -a ssl_opts <<< "$(mysql_client_extra_opts)"
+    read -r -a ssl_opts <<<"$(mysql_client_extra_opts)"
 
     mv "$wrapper_file" "$wrapped_binary_file"
     cat >"$wrapper_file" <<EOF
diff --git a/bitnami/joomla/README.md b/bitnami/joomla/README.md
index 8c96f890ab95..ad9e3ffa955a 100644
--- a/bitnami/joomla/README.md
+++ b/bitnami/joomla/README.md
@@ -45,7 +45,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`4`, `4-debian-10`, `4.1.2`, `4.1.2-debian-10-r6`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-joomla/blob/4.1.2-debian-10-r6/4/debian-10/Dockerfile)
+* [`4`, `4-debian-10`, `4.1.2`, `4.1.2-debian-10-r7`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-joomla/blob/4.1.2-debian-10-r7/4/debian-10/Dockerfile)
 * [`3`, `3-debian-10`, `3.10.8`, `3.10.8-debian-10-r7` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-joomla/blob/3.10.8-debian-10-r7/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/joomla GitHub repo](https://github.com/bitnami/bitnami-docker-joomla).