diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index 9a42097faec0..fecc05158781 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-r90" \ + BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r91" \ 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 66ef8d0271d5..68a0c4d60144 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 @@ -53,7 +53,7 @@ export PHP_FPM_CONF_FILE="${PHP_CONF_DIR}/php-fpm.conf" export PHP_FPM_PID_FILE="${PHP_TMP_DIR}/php-fpm.pid" export PHP_FPM_DEFAULT_LISTEN_ADDRESS="${PHP_TMP_DIR}/www.sock" # only used at build time export PHP_FPM_LISTEN_ADDRESS="${PHP_FPM_LISTEN_ADDRESS:-}" -export PATH="${PHP_FPM_SBIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}" +export PATH="${PHP_FPM_SBIN_DIR}:${PHP_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}" # PHP configuration export PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE:-}" diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/post-init.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/post-init.sh index 4bc9338033e8..b01f90c43925 100755 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/post-init.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/post-init.sh @@ -8,16 +8,16 @@ set -o pipefail # set -o xtrace # Uncomment this line for debugging purposes # Only execute init scripts once -[[ -f "/bitnami/phpmyadmin/.user_scripts_initialized" ]] && exit - -read -r -a init_scripts <<< "$(find "/docker-entrypoint-init.d" -type f -print0 | xargs -0)" -if [[ "${#init_scripts[@]}" -gt 0 ]] && [[ ! -f "/bitnami/phpmyadmin/.user_scripts_initialized" ]]; then - mkdir -p "/bitnami/phpmyadmin" - for init_script in "${init_scripts[@]}"; do - for init_script_type_handler in /post-init.d/*.sh; do - "$init_script_type_handler" "$init_script" +if [[ ! -f "/bitnami/phpmyadmin/.user_scripts_initialized" && -d "/docker-entrypoint-init.d" ]]; then + read -r -a init_scripts <<< "$(find "/docker-entrypoint-init.d" -type f -print0 | xargs -0)" + if [[ "${#init_scripts[@]}" -gt 0 ]] && [[ ! -f "/bitnami/phpmyadmin/.user_scripts_initialized" ]]; then + mkdir -p "/bitnami/phpmyadmin" + for init_script in "${init_scripts[@]}"; do + for init_script_type_handler in /post-init.d/*.sh; do + "$init_script_type_handler" "$init_script" + done done - done -fi + fi -touch "/bitnami/phpmyadmin/.user_scripts_initialized" + touch "/bitnami/phpmyadmin/.user_scripts_initialized" +fi diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 592d187fdec6..da43be3bdd4d 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-r90`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r90/5/debian-10/Dockerfile) +* [`5-debian-10`, `5.0.2-debian-10-r91`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r91/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).