From 63ce4695faee668beb245652d9e9a9fd0d689aa4 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 29 Jun 2020 21:57:30 +0000 Subject: [PATCH] 5.0.2-debian-10-r98 release --- bitnami/phpmyadmin/5/debian-10/Dockerfile | 4 +-- .../prebuildfs/opt/bitnami/scripts/libfs.sh | 2 +- .../opt/bitnami/scripts/libpersistence.sh | 4 +++ .../opt/bitnami/scripts/apache/reload.sh | 18 +++++++++++ .../opt/bitnami/scripts/apache/restart.sh | 17 ++++++++++ .../opt/bitnami/scripts/apache/start.sh | 32 +++++++++++++++++++ .../opt/bitnami/scripts/apache/status.sh | 21 ++++++++++++ .../rootfs/opt/bitnami/scripts/apache/stop.sh | 32 +++++++++++++++++++ bitnami/phpmyadmin/README.md | 2 +- 9 files changed, 128 insertions(+), 4 deletions(-) create mode 100755 bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/reload.sh create mode 100755 bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/restart.sh create mode 100755 bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/start.sh create mode 100755 bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/status.sh create mode 100755 bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/stop.sh diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index ebd19b8a1eb4..97e215bc740b 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -12,7 +12,7 @@ RUN install_packages acl ca-certificates curl gzip libaudit1 libbsd0 libbz2-1.0 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.19-2" --checksum 25bba77655b298c62ab474954837acbc167a4bcc8555c39b419644c999207c5f RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.43-5" --checksum e9faded57e3703fe9fcea650eb302e673d969a399fe9dfafa67e173465637665 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.23-1" --checksum efab843077267af6a8cde53440a1fef0acf8cb67ab1dcd0b6da2e9cbe050c7e1 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.19-0" --checksum 9d3e785b7544f374e4943f94795625e9048a89fab109ada62552c5784c68bbbe +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.19-2" --checksum c5dddf3ea541f5c0d6f65fa7d743de710de5ec53cdf8458a25c74e70f0c8397d RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-1" --checksum a94f94357aa06f3718db1550fa5f5188cd61383d66bf754eef49c58a18bf02cc RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "phpmyadmin" "5.0.2-3" --checksum b890352acc4429be19d4d319a2ea46b523a718fb325cb0a66604e0294ab7e99c RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-1" --checksum 51cfb1b7fd7b05b8abd1df0278c698103a9b1a4964bdacd87ca1d5c01631d59c @@ -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-r97" \ + BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r98" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 257c4297590a..8f37ecbd823e 100644 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -106,7 +106,7 @@ is_file_writable() { relativize() { local -r path="${1:?missing path}" local -r base="${2:?missing base}" - pushd / >/dev/null + pushd "$base" >/dev/null realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||' popd >/dev/null } diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh index dce83ffca153..6e42c882dbff 100644 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -39,6 +39,10 @@ persist_app() { local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder local -r tmp_file="/tmp/perms.acl" for file_to_persist in "${files_to_persist[@]}"; do + if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then + error "Cannot persist '${file_to_persist}' because it does not exist" + return 1 + fi file_to_persist_relative="$(relativize "$file_to_persist" "$install_dir")" file_to_persist_destination="${persist_dir}/${file_to_persist_relative}" file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")" diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/reload.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/reload.sh new file mode 100755 index 000000000000..3bf21a282611 --- /dev/null +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/reload.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose + +# Load libraries +. /opt/bitnami/scripts/libapache.sh +. /opt/bitnami/scripts/liblog.sh + +# Load Apache environment +. /opt/bitnami/scripts/apache-env.sh + +info "** Reloading Apache configuration **" +exec "${APACHE_BIN_DIR}/apachectl" -k graceful diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/restart.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/restart.sh new file mode 100755 index 000000000000..8993aaa58d8e --- /dev/null +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/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/libapache.sh + +# Load Apache environment variables +. /opt/bitnami/scripts/apache-env.sh + +/opt/bitnami/scripts/apache/stop.sh +/opt/bitnami/scripts/apache/start.sh diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/start.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/start.sh new file mode 100755 index 000000000000..8ea04e19f09e --- /dev/null +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/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/libapache.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/liblog.sh + +# Load Apache environment variables +. /opt/bitnami/scripts/apache-env.sh + +error_code=0 + +if is_apache_not_running; then + "${APACHE_BIN_DIR}/httpd" -f "$APACHE_CONF_FILE" + if ! retry_while "is_apache_running"; then + error "apache did not start" + error_code=1 + else + info "apache started" + fi +else + info "apache is already running" +fi + +exit "${error_code}" diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/status.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/status.sh new file mode 100755 index 000000000000..c6f434dd4407 --- /dev/null +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/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/libapache.sh +. /opt/bitnami/scripts/liblog.sh + +# Load Apache environment variables +. /opt/bitnami/scripts/apache-env.sh + +if is_apache_running; then + info "apache is already running" +else + info "apache is not running" +fi diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/stop.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/stop.sh new file mode 100755 index 000000000000..920a075d8b92 --- /dev/null +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/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/libapache.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/liblog.sh + +# Load Apache environment variables +. /opt/bitnami/scripts/apache-env.sh + +error_code=0 + +if is_apache_running; then + apache_stop + if ! retry_while "is_apache_not_running"; then + error "apache could not be stopped" + error_code=1 + else + info "apache stopped" + fi +else + info "apache is not running" +fi + +exit "${error_code}" diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 08b752562113..8aa521602afc 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-r97`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r97/5/debian-10/Dockerfile) +* [`5-debian-10`, `5.0.2-debian-10-r98`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r98/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).