From 4ad1befb488cde8211cceecb106f00a57b0e5e28 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 22 Dec 2020 10:40:06 +0000 Subject: [PATCH] 5.0.4-debian-10-r64 release --- bitnami/phpmyadmin/5/debian-10/Dockerfile | 6 ++-- .../opt/bitnami/.bitnami_components.json | 4 +-- .../opt/bitnami/scripts/libwebserver.sh | 1 - .../rootfs/opt/bitnami/scripts/libphp.sh | 24 +++++++++++++ .../rootfs/opt/bitnami/scripts/php/reload.sh | 35 +++++++++++++++++++ .../rootfs/opt/bitnami/scripts/php/restart.sh | 17 +++++++++ .../rootfs/opt/bitnami/scripts/php/start.sh | 32 +++++++++++++++++ .../rootfs/opt/bitnami/scripts/php/status.sh | 21 +++++++++++ .../rootfs/opt/bitnami/scripts/php/stop.sh | 32 +++++++++++++++++ bitnami/phpmyadmin/README.md | 2 +- 10 files changed, 167 insertions(+), 7 deletions(-) create mode 100755 bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/reload.sh create mode 100755 bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/restart.sh create mode 100755 bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/start.sh create mode 100755 bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/status.sh create mode 100755 bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/stop.sh diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index 2a474ef2609a..9cb5a3b40b39 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -10,7 +10,7 @@ COPY prebuildfs / # Install required system packages and dependencies 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.13-3" --checksum afb06e12396c6901d65ab826cafca0ae532b1d8a5e8293071edda395ba409ae6 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-3" --checksum 07991412bb24fc8493228f4bd67b28a77e011242971dcdd687a5d2113ac89bc9 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-4" --checksum 35f10bccc2a1e55c050c9c483e28ee729e11f873acadd327d7361b53938a0101 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.27-0" --checksum f96905e763a6334b75a7cdb07f8d89658cde02be41cb09d91d0682fc649fdcff RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.13-1" --checksum 90851eaf7bea77d3499ec654e51a6714c09eb3097909338f42ceb878b8fa1ae9 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe @@ -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.4-debian-10-r63" \ + BITNAMI_IMAGE_VERSION="5.0.4-debian-10-r64" \ 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 e6ad9a8edff6..979399dbff12 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 @@ -1,10 +1,10 @@ { "apache": { "arch": "amd64", - "digest": "07991412bb24fc8493228f4bd67b28a77e011242971dcdd687a5d2113ac89bc9", + "digest": "35f10bccc2a1e55c050c9c483e28ee729e11f873acadd327d7361b53938a0101", "distro": "debian-10", "type": "NAMI", - "version": "2.4.46-3" + "version": "2.4.46-4" }, "gosu": { "arch": "amd64", diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 7fce9bb4a9a0..25bff4a05105 100644 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -153,7 +153,6 @@ web_server_restart() { # None ######################### web_server_reload() { - info "Reloading $(web_server_type) configuration" "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" } 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 6f76902be990..1773eeeb1b7b 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 @@ -9,6 +9,7 @@ . /opt/bitnami/scripts/libfile.sh . /opt/bitnami/scripts/libservice.sh . /opt/bitnami/scripts/libvalidations.sh +. /opt/bitnami/scripts/libwebserver.sh ######################## # Add or modify an entry in the main PHP configuration file (php.ini) @@ -181,6 +182,29 @@ php_fpm_reload() { php_fpm_stop "USR2" } +######################## +# Check if PHP-FPM is enabled for the current Bitnami installation +# Globals: +# None +# Arguments: +# None +# Returns: +# true if PHP-FPM is enabled, false otherwise +######################## +is_php_fpm_enabled() { + if [[ "$(web_server_type)" = "apache" ]]; then + # If mod_php is enabled, then PHP-FPM is cannot be + if apachectl -M | grep -q -E "php[0-9]?_module"; then + false + else + true + fi + else + # Assume PHP-FPM is enabled with any other configuration (i.e. NGINX) + true + fi +} + ######################## # Check if PHP-FPM is running # Globals: diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/reload.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/reload.sh new file mode 100755 index 000000000000..f0977ed2d47a --- /dev/null +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/reload.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# shellcheck disable=SC1090,SC1091 + +set -o errexit +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/liblog.sh +. /opt/bitnami/scripts/libwebserver.sh + +# Load PHP-FPM environment +. /opt/bitnami/scripts/php-env.sh + +# Load web server environment and functions +. "/opt/bitnami/scripts/$(web_server_type)-env.sh" + +error_code=0 + +if is_php_fpm_enabled; then + if is_php_fpm_not_running; then + error "php-fpm is not running" + error_code=1 + else + info "** Reloading PHP-FPM configuration **" + php_fpm_reload + fi +else + web_server_reload +fi + +exit "$error_code" diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/restart.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/restart.sh new file mode 100755 index 000000000000..686174792b72 --- /dev/null +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/restart.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libphp.sh + +# Load PHP-FPM environment variables +. /opt/bitnami/scripts/php-env.sh + +/opt/bitnami/scripts/php/stop.sh +/opt/bitnami/scripts/php/start.sh diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/start.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/start.sh new file mode 100755 index 000000000000..db62dee9997f --- /dev/null +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/start.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libphp.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/liblog.sh + +# Load PHP-FPM environment variables +. /opt/bitnami/scripts/php-env.sh + +error_code=0 + +if is_php_fpm_not_running; then + nohup /opt/bitnami/scripts/php/run.sh >/dev/null 2>&1 & + if ! retry_while "is_php_fpm_running"; then + error "php-fpm did not start" + error_code=1 + else + info "php-fpm started" + fi +else + info "php-fpm is already running" +fi + +exit "${error_code}" diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/status.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/status.sh new file mode 100755 index 000000000000..d2f4b058ba3e --- /dev/null +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/status.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libphp.sh +. /opt/bitnami/scripts/liblog.sh + +# Load PHP-FPM environment variables +. /opt/bitnami/scripts/php-env.sh + +if is_php_fpm_running; then + info "php-fpm is already running" +else + info "php-fpm is not running" +fi diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/stop.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/stop.sh new file mode 100755 index 000000000000..2b2477452469 --- /dev/null +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php/stop.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libphp.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/liblog.sh + +# Load PHP-FPM environment variables +. /opt/bitnami/scripts/php-env.sh + +error_code=0 + +if is_php_fpm_running; then + BITNAMI_QUIET=1 php_fpm_stop + if ! retry_while "is_php_fpm_not_running"; then + error "php-fpm could not be stopped" + error_code=1 + else + info "php-fpm stopped" + fi +else + info "php-fpm is not running" +fi + +exit "${error_code}" diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 9bc1b1a49284..ec55a84f386a 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.4`, `5.0.4-debian-10-r63`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.4-debian-10-r63/5/debian-10/Dockerfile) +* [`5`, `5-debian-10`, `5.0.4`, `5.0.4-debian-10-r64`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.4-debian-10-r64/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).