From eff9bb623ab521c9dbceeeb2baef2c78183e6eac Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 1 Nov 2019 06:52:03 +0000 Subject: [PATCH] 4.9.1-debian-9-r27 release --- bitnami/phpmyadmin/4/debian-9/Dockerfile | 2 +- .../4/debian-9/rootfs/apache-init.sh | 27 +++++++++++ .../4/debian-9/rootfs/app-entrypoint.sh | 2 + .../phpmyadmin/4/debian-9/rootfs/post-init.sh | 46 +++++++++++++++++++ bitnami/phpmyadmin/README.md | 2 +- 5 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 bitnami/phpmyadmin/4/debian-9/rootfs/apache-init.sh create mode 100644 bitnami/phpmyadmin/4/debian-9/rootfs/post-init.sh diff --git a/bitnami/phpmyadmin/4/debian-9/Dockerfile b/bitnami/phpmyadmin/4/debian-9/Dockerfile index ad702062b0bb..3bd624667e22 100644 --- a/bitnami/phpmyadmin/4/debian-9/Dockerfile +++ b/bitnami/phpmyadmin/4/debian-9/Dockerfile @@ -10,7 +10,7 @@ RUN bitnami-pkg unpack phpmyadmin-4.9.1-0 --checksum e66327b570c78c86d42af7aaac1 COPY rootfs / ENV BITNAMI_APP_NAME="phpmyadmin" \ - BITNAMI_IMAGE_VERSION="4.9.1-debian-9-r26" \ + BITNAMI_IMAGE_VERSION="4.9.1-debian-9-r27" \ DATABASE_ENABLE_SSL="no" \ DATABASE_HOST="mariadb" \ DATABASE_PORT_NUMBER="3306" \ diff --git a/bitnami/phpmyadmin/4/debian-9/rootfs/apache-init.sh b/bitnami/phpmyadmin/4/debian-9/rootfs/apache-init.sh new file mode 100644 index 000000000000..940efb6d8576 --- /dev/null +++ b/bitnami/phpmyadmin/4/debian-9/rootfs/apache-init.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +# Check whether Apache ports must be configured +if [[ -n "${APACHE_HTTP_PORT_NUMBER:-}" ]]; then + export APACHE_SET_HTTP_PORT="yes" +fi +if [[ -n "${APACHE_HTTPS_PORT_NUMBER:-}" ]]; then + export APACHE_SET_HTTPS_PORT="yes" +fi + +# Copy vhosts file +if [[ "$(ls -A /vhosts 2>/dev/null)" ]]; then + info "Found vhost definitions in /vhosts. Copying them to /opt/bitnami/apache/conf/vhosts" + cp -r /vhosts/* /opt/bitnami/apache/conf/vhosts +fi + +# Mount certificate files +if [[ -d "/opt/bitnami/apache/certs" ]]; then + warn "The directory '/opt/bitnami/apache/certs' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '/opt/bitnami/apache/conf/bitnami/certs' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#using-custom-ssl-certificates" + warn "Restoring certificates at '/opt/bitnami/apache/certs' to '/opt/bitnami/apache/conf/bitnami/certs'..." + rm -rf /opt/bitnami/apache/conf/bitnami/certs + ln -sf /opt/bitnami/apache/certs /opt/bitnami/apache/conf/bitnami/certs +elif [ "$(ls -A /certs 2>/dev/null)" ]; then + info "Mounting certificates files from /certs..." + rm -rf /opt/bitnami/apache/conf/bitnami/certs + ln -sf /certs /opt/bitnami/apache/conf/bitnami/certs +fi diff --git a/bitnami/phpmyadmin/4/debian-9/rootfs/app-entrypoint.sh b/bitnami/phpmyadmin/4/debian-9/rootfs/app-entrypoint.sh index 3d8ef2469848..745cb7cb599d 100755 --- a/bitnami/phpmyadmin/4/debian-9/rootfs/app-entrypoint.sh +++ b/bitnami/phpmyadmin/4/debian-9/rootfs/app-entrypoint.sh @@ -6,8 +6,10 @@ print_welcome_page if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then + . /apache-init.sh nami_initialize apache php phpmyadmin info "Starting phpmyadmin... " + . /post-init.sh fi exec tini -- "$@" diff --git a/bitnami/phpmyadmin/4/debian-9/rootfs/post-init.sh b/bitnami/phpmyadmin/4/debian-9/rootfs/post-init.sh new file mode 100644 index 000000000000..d6a96bd2ac85 --- /dev/null +++ b/bitnami/phpmyadmin/4/debian-9/rootfs/post-init.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +. /opt/bitnami/base/functions + +if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f /bitnami/"$BITNAMI_APP_NAME"/.user_scripts_initialized ]]; then + for f in /docker-entrypoint-init.d/*; do + failure=0 + case "$f" in + *.sh) + if [[ -x "$f" ]]; then + info "Executing $f"; "$f" || failure=$? + else + info "Sourcing $f"; . "$f" + fi + ;; + + *.php) + info "Executing $f with PHP interpreter" + php "$f" || failure=$? + ;; + + *.sql|*.sql.gz) + info "Executing $f" + mysql_cmd=( mysql -h "$MARIADB_HOST" -P "$MARIADB_PORT_NUMBER" -u "$MARIADB_ROOT_USER" ) + if [[ "${ALLOW_EMPTY_PASSWORD:-no}" != "yes" ]]; then + mysql_cmd+=( -p"$MARIADB_ROOT_PASSWORD" ) + fi + if [[ "$f" == *".sql" ]]; then + "${mysql_cmd[@]}" < "$f" || failure=$? + elif [[ "$f" == *".sql.gz" ]]; then + gunzip -c "$f" | "${mysql_cmd[@]}" || failure=$? + fi + ;; + + *) + info "Ignoring $f" + ;; + esac + if [[ "$failure" -ne 0 ]]; then + error "Failed to execute $f" + exit "$failure" + fi + done + info "Custom scripts were executed" + touch /bitnami/"$BITNAMI_APP_NAME"/.user_scripts_initialized +fi diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index b1a195711f92..5633d2742a4e 100644 --- a/bitnami/phpmyadmin/README.md +++ b/bitnami/phpmyadmin/README.md @@ -39,7 +39,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`4-ol-7`, `4.9.1-ol-7-r41` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/4.9.1-ol-7-r41/4/ol-7/Dockerfile) -* [`4-debian-9`, `4.9.1-debian-9-r26`, `4`, `4.9.1`, `4.9.1-r26`, `latest` (4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/4.9.1-debian-9-r26/4/debian-9/Dockerfile) +* [`4-debian-9`, `4.9.1-debian-9-r27`, `4`, `4.9.1`, `4.9.1-r27`, `latest` (4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/4.9.1-debian-9-r27/4/debian-9/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).