From b0466fae9bbed4e09b5053fcfb9be5948a12c06c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 7 Apr 2022 09:01:08 +0000
Subject: [PATCH] 1.7.8-5-debian-10-r19 release

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

diff --git a/bitnami/prestashop/1.7/debian-10/Dockerfile b/bitnami/prestashop/1.7/debian-10/Dockerfile
index 73ab705bc144..c010ba6fb455 100644
--- a/bitnami/prestashop/1.7/debian-10/Dockerfile
+++ b/bitnami/prestashop/1.7/debian-10/Dockerfile
@@ -30,7 +30,6 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     APP_VERSION="1.7.8-5" \
     BITNAMI_APP_NAME="prestashop" \
-    BITNAMI_IMAGE_VERSION="1.7.8-5-debian-10-r18" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/prestashop/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/prestashop/1.7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/prestashop/1.7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index fee929c4ee1a..bd3d43db6e43 100644
--- a/bitnami/prestashop/1.7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/prestashop/1.7/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/prestashop/README.md b/bitnami/prestashop/README.md
index f20c5d4dec62..c72dbef95bea 100644
--- a/bitnami/prestashop/README.md
+++ b/bitnami/prestashop/README.md
@@ -43,7 +43,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/).
 
 
-* [`1.7`, `1.7-debian-10`, `1.7.8-5`, `1.7.8-5-debian-10-r18`, `latest` (1.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-prestashop/blob/1.7.8-5-debian-10-r18/1.7/debian-10/Dockerfile)
+* [`1.7`, `1.7-debian-10`, `1.7.8-5`, `1.7.8-5-debian-10-r19`, `latest` (1.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-prestashop/blob/1.7.8-5-debian-10-r19/1.7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/prestashop GitHub repo](https://github.com/bitnami/bitnami-docker-prestashop).