From 57738da17739e2f302eabe2335e2dd63a547ecf5 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 3 Jul 2020 01:12:37 +0000
Subject: [PATCH] 5.0.2-debian-10-r101 release

---
 bitnami/phpmyadmin/5/debian-10/Dockerfile     |  2 +-
 .../rootfs/opt/bitnami/scripts/php-env.sh     |  4 ++++
 .../opt/bitnami/scripts/phpmyadmin/setup.sh   | 22 ++++++++++++-------
 bitnami/phpmyadmin/README.md                  |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile
index bb48215834dc..bf4ce93b2442 100644
--- a/bitnami/phpmyadmin/5/debian-10/Dockerfile
+++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile
@@ -29,7 +29,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-r100" \
+    BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r101" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
index 68a0c4d60144..60633c6ac219 100644
--- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
+++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
@@ -55,6 +55,10 @@ export PHP_FPM_DEFAULT_LISTEN_ADDRESS="${PHP_TMP_DIR}/www.sock" # only used at b
 export PHP_FPM_LISTEN_ADDRESS="${PHP_FPM_LISTEN_ADDRESS:-}"
 export PATH="${PHP_FPM_SBIN_DIR}:${PHP_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}"
 
+# System users (when running with a privileged user)
+export PHP_FPM_DAEMON_USER="daemon"
+export PHP_FPM_DAEMON_GROUP="daemon"
+
 # PHP configuration
 export PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE:-}"
 export PHP_POST_MAX_SIZE="${PHP_POST_MAX_SIZE:-}"
diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin/setup.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin/setup.sh
index fd27b82fb7ff..3d0a9bb4292e 100755
--- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin/setup.sh
+++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin/setup.sh
@@ -7,23 +7,29 @@ set -o nounset
 set -o pipefail
 # set -o xtrace # Uncomment this line for debugging purpose
 
-# Load libraries
-. /opt/bitnami/scripts/libphp.sh
-. /opt/bitnami/scripts/libphpmyadmin.sh
-
 # Load phpMyAdmin environment
 . /opt/bitnami/scripts/phpmyadmin-env.sh
 
+# Load web server environment and functions (after phpMyAdmin environment file so MODULE is not set to a wrong value)
+. /opt/bitnami/scripts/libwebserver.sh
+
+# Load libraries
+. /opt/bitnami/scripts/libphpmyadmin.sh
+. /opt/bitnami/scripts/libos.sh
+
 # Ensure phpMyAdmin environment variables are valid
 phpmyadmin_validate
 
+# Ensure proper ownership for the phpMyAdmin 'tmp' directory
+if am_i_root; then
+    ensure_user_exists "$WEB_SERVER_DAEMON_USER" "$WEB_SERVER_DAEMON_GROUP"
+    info "Ensuring phpMyAdmin directories have proper permissions"
+    configure_permissions_ownership "$PHPMYADMIN_TMP_DIR" -u "$WEB_SERVER_DAEMON_USER" -g "$WEB_SERVER_DAEMON_GROUP"
+fi
+
 # Ensure phpMyAdmin is initialized
 phpmyadmin_initialize
 
-# Load additional required libraries
-# shellcheck disable=SC1091
-. /opt/bitnami/scripts/libwebserver.sh
-
 # Configure web server for phpMyAdmin based on the runtime environment
 info "Enabling web server application configuration for phpMyAdmin"
 phpmyadmin_ensure_web_server_app_configuration_exists
diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md
index 62f4bd69b069..1b1dad7cd97e 100644
--- a/bitnami/phpmyadmin/README.md
+++ b/bitnami/phpmyadmin/README.md
@@ -36,7 +36,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-debian-10`, `5.0.2-debian-10-r100`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r100/5/debian-10/Dockerfile)
+* [`5-debian-10`, `5.0.2-debian-10-r101`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r101/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).