From 66fc8e7c47f27e260c3e4e706bad79bbfef05140 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 7 Apr 2022 01:59:29 +0000
Subject: [PATCH] 4.10.2-debian-10-r51 release

---
 bitnami/dreamfactory/4/debian-10/Dockerfile               | 5 ++---
 .../prebuildfs/opt/bitnami/.bitnami_components.json       | 4 ++--
 .../rootfs/opt/bitnami/scripts/libmysqlclient.sh          | 8 ++++++--
 bitnami/dreamfactory/README.md                            | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/bitnami/dreamfactory/4/debian-10/Dockerfile b/bitnami/dreamfactory/4/debian-10/Dockerfile
index b15477f475e9..b1423d7ced0f 100644
--- a/bitnami/dreamfactory/4/debian-10/Dockerfile
+++ b/bitnami/dreamfactory/4/debian-10/Dockerfile
@@ -12,7 +12,7 @@ RUN install_packages acl ca-certificates curl gzip jq libaudit1 libbsd0 libbz2-1
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.28-14" --checksum 3dc3e85c255ef06331fb70a605478f076b1a33810f2573e94ec2b295f1e00e4e
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.53-0" --checksum 716e4948a2c40f0a0cc5b1656052aeef916a79152250b0b6c1392dd1187f575a
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "redis-client" "6.0.16-34" --checksum 2745d45d8cf3ff0bda5ccb890700047f2d295f195216fb7186b6db0bb139c766
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "11.15.0-4" --checksum f641b12e9ac577e4139708247a590b09683ab8cbcdf665b99f596df68ae9dbc1
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "11.15.0-5" --checksum 43a49afcdf3e6571973c5dfd1a0aff1b5507fe1822dfd9487e3460e114857fda
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.6.7-4" --checksum 14329a8ec0a649ecb9ffb37085a547183748efedea8ed029801ab9b381ab7173
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.28-4" --checksum 216cab0049a1737702a17c924ed7c20128347adc605e6b78fd40db3064c92f5c
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.35.1-6" --checksum 75c0294b7af868721549926139e6ddbec9548fbd0e69c7e199d640a4531d858b
@@ -24,8 +24,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/dreamfactory/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
@@ -34,7 +34,6 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     APP_VERSION="4.10.2" \
     BITNAMI_APP_NAME="dreamfactory" \
-    BITNAMI_IMAGE_VERSION="4.10.2-debian-10-r50" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/redis/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/mysql/bin:/opt/bitnami/git/bin:/opt/bitnami/common/bin:/opt/bitnami/dreamfactory/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/dreamfactory/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dreamfactory/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index aa03bf038204..0738b0c80b7e 100644
--- a/bitnami/dreamfactory/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/dreamfactory/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -50,10 +50,10 @@
     },
     "postgresql-client": {
         "arch": "amd64",
-        "digest": "f641b12e9ac577e4139708247a590b09683ab8cbcdf665b99f596df68ae9dbc1",
+        "digest": "43a49afcdf3e6571973c5dfd1a0aff1b5507fe1822dfd9487e3460e114857fda",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "11.15.0-4"
+        "version": "11.15.0-5"
     },
     "redis-client": {
         "arch": "amd64",
diff --git a/bitnami/dreamfactory/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/dreamfactory/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index fee929c4ee1a..bd3d43db6e43 100644
--- a/bitnami/dreamfactory/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/dreamfactory/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/dreamfactory/README.md b/bitnami/dreamfactory/README.md
index 6b9c931348ff..519d427c89bb 100644
--- a/bitnami/dreamfactory/README.md
+++ b/bitnami/dreamfactory/README.md
@@ -37,7 +37,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.10.2`, `4.10.2-debian-10-r50`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-dreamfactory/blob/4.10.2-debian-10-r50/4/debian-10/Dockerfile)
+- [`4`, `4-debian-10`, `4.10.2`, `4.10.2-debian-10-r51`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-dreamfactory/blob/4.10.2-debian-10-r51/4/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/dreamfactory GitHub repo](https://github.com/bitnami/bitnami-docker-dreamfactory).