From 6f96b97b0ebde75f00e57de2e84dba095af4390a Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 7 Apr 2022 05:12:11 +0000
Subject: [PATCH] 5.4.7-debian-10-r3 release

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

diff --git a/bitnami/symfony/5.4/debian-10/Dockerfile b/bitnami/symfony/5.4/debian-10/Dockerfile
index 8db232dbccab..2298207ecdfe 100644
--- a/bitnami/symfony/5.4/debian-10/Dockerfile
+++ b/bitnami/symfony/5.4/debian-10/Dockerfile
@@ -22,7 +22,6 @@ RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/symfony/postunpack.sh
 ENV APP_VERSION="5.4.7" \
     BITNAMI_APP_NAME="symfony" \
-    BITNAMI_IMAGE_VERSION="5.4.7-debian-10-r2" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/symfony/bin:/opt/bitnami/common/bin:$PATH" \
     PHP_ENABLE_OPCACHE="0"
 
diff --git a/bitnami/symfony/5.4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/symfony/5.4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index fee929c4ee1a..bd3d43db6e43 100644
--- a/bitnami/symfony/5.4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/symfony/5.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/symfony/README.md b/bitnami/symfony/README.md
index bdb81391ef42..d4a506b479c9 100644
--- a/bitnami/symfony/README.md
+++ b/bitnami/symfony/README.md
@@ -38,7 +38,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`6.0`, `6.0-debian-10`, `6.0.7`, `6.0.7-debian-10-r2`, `latest` (6.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-symfony/blob/6.0.7-debian-10-r2/6.0/debian-10/Dockerfile)
-* [`5.4`, `5.4-debian-10`, `5.4.7`, `5.4.7-debian-10-r2` (5.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-symfony/blob/5.4.7-debian-10-r2/5.4/debian-10/Dockerfile)
+* [`5.4`, `5.4-debian-10`, `5.4.7`, `5.4.7-debian-10-r3` (5.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-symfony/blob/5.4.7-debian-10-r3/5.4/debian-10/Dockerfile)
 * [`4.4`, `4.4-debian-10`, `4.4.40`, `4.4.40-debian-10-r2` (4.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-symfony/blob/4.4.40-debian-10-r2/4.4/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/symfony GitHub repo](https://github.com/bitnami/bitnami-docker-symfony).