From 345967faf399d339df388ddc5b1e47d4819f9b8c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 8 Oct 2020 18:49:38 +0000
Subject: [PATCH] 5.0.2-debian-10-r183 release

---
 bitnami/phpmyadmin/5/debian-10/Dockerfile     |  6 ++--
 .../opt/bitnami/.bitnami_components.json      |  4 +--
 .../rootfs/opt/bitnami/scripts/libphp.sh      | 34 +++++++++++++++++++
 bitnami/phpmyadmin/README.md                  |  2 +-
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile
index 96f6a4b19490..3d2c78ec9d68 100644
--- a/bitnami/phpmyadmin/5/debian-10/Dockerfile
+++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile
@@ -11,7 +11,7 @@ COPY prebuildfs /
 RUN install_packages acl ca-certificates curl gzip libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.11-2" --checksum aabc290a13f5bee0a31bd9edf504fc025d51a7b95abeff9edcef3cf4d90e3393
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-2" --checksum 8d591562d804902c986f59f18bbea5e47289f4cbfb364c13862d4b9df557e0f4
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.24-0" --checksum 94a7e3c58310f59af5c1e14544de0a42bd1ecf394a159db94aacf8ccf6058436
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.25-0" --checksum 12528e33966094535a302d557eca3eb1ae7d5c7b8fff4b9e70d96cafedbb5341
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.11-1" --checksum 2a552ec9133bfeea17ee4fa40976499165cc3c6c89e00d483063df083abe4b13
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-2" --checksum f1bee333423f6627d795ea9e0b6a89c18d2e5c2e2d015bb4620f040f1d520cf6
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "phpmyadmin" "5.0.2-3" --checksum b890352acc4429be19d4d319a2ea46b523a718fb325cb0a66604e0294ab7e99c
@@ -21,8 +21,8 @@ RUN apt-get update && apt-get upgrade -y && \
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
-RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache/postunpack.sh
+RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/phpmyadmin/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
@@ -30,7 +30,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="phpmyadmin" \
-    BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r182" \
+    BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r183" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index f5715693382f..a881c42a751b 100644
--- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -22,10 +22,10 @@
     },
     "mysql-client": {
         "arch": "amd64",
-        "digest": "94a7e3c58310f59af5c1e14544de0a42bd1ecf394a159db94aacf8ccf6058436",
+        "digest": "12528e33966094535a302d557eca3eb1ae7d5c7b8fff4b9e70d96cafedbb5341",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "10.3.24-0"
+        "version": "10.3.25-0"
     },
     "php": {
         "arch": "amd64",
diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
index e3a8fcf73ae1..214308e26d81 100644
--- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
+++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
@@ -84,6 +84,40 @@ php_convert_to_boolean() {
     is_boolean_yes "$value" && echo "true" || echo "false"
 }
 
+########################
+# Execute/run PHP code and print to stdout
+# Globals:
+#   None
+# Stdin:
+#   Code to execute
+# Arguments:
+#   $1..$n - Input arguments to script
+# Returns:
+#   None
+#########################
+php_execute_print_output() {
+    local php_cmd
+    # Obtain the command specified via stdin
+    php_cmd="$(</dev/stdin)"
+    debug "Executing PHP code:\n${php_cmd}"
+    php -- "$@" <<< "<?php ${php_cmd}"
+}
+
+########################
+# Execute/run PHP code
+# Globals:
+#   None
+# Stdin:
+#   Code to execute
+# Arguments:
+#   $1..$n - Input arguments to script
+# Returns:
+#   None
+#########################
+php_execute() {
+    debug_execute php_execute_print_output "$@"
+}
+
 ########################
 # Stop PHP-FPM
 # Globals:
diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md
index 94adae86be64..63af2665d98a 100644
--- a/bitnami/phpmyadmin/README.md
+++ b/bitnami/phpmyadmin/README.md
@@ -38,7 +38,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 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/).
 
 
-* [`5`, `5-debian-10`, `5.0.2`, `5.0.2-debian-10-r182`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r182/5/debian-10/Dockerfile)
+* [`5`, `5-debian-10`, `5.0.2`, `5.0.2-debian-10-r183`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r183/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).