From 6a9b32d94cb9eed4608c2efe64dbb6d357a72114 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 25 Mar 2022 23:40:01 +0000 Subject: [PATCH] 5.1.3-debian-10-r39 release --- bitnami/phpmyadmin/5/debian-10/Dockerfile | 4 ++-- .../opt/bitnami/scripts/libwebserver.sh | 4 ---- .../rootfs/opt/bitnami/scripts/apache-env.sh | 1 + .../rootfs/opt/bitnami/scripts/libapache.sh | 16 ++++++++++------ .../rootfs/opt/bitnami/scripts/php-env.sh | 1 + .../rootfs/opt/bitnami/scripts/phpmyadmin-env.sh | 1 + bitnami/phpmyadmin/README.md | 2 +- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index d12e379aecd8..282f99470e98 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -21,15 +21,15 @@ 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 APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ APP_VERSION="5.1.3" \ BITNAMI_APP_NAME="phpmyadmin" \ - BITNAMI_IMAGE_VERSION="5.1.3-debian-10-r38" \ + BITNAMI_IMAGE_VERSION="5.1.3-debian-10-r39" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" EXPOSE 8080 8443 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 503650210583..818c2158032b 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 @@ -392,10 +392,6 @@ web_server_update_app_configuration() { --hosts \ | --server-name \ | --server-aliases \ - | --enable-http \ - | --enable-https \ - | --disable-http \ - | --disable-https \ | --http-port \ | --https-port \ ) diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh index ccbd724cb02f..d2e75906b076 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh @@ -9,6 +9,7 @@ # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) # Load logging library +# shellcheck disable=SC1090,SC1091 . /opt/bitnami/scripts/liblog.sh export BITNAMI_ROOT_DIR="/opt/bitnami" diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh index 2a6b3c70deed..0aeb9a906755 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh @@ -400,7 +400,7 @@ ensure_apache_app_configuration_exists() { | --server-aliases) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift - read -r -a "$var_name" <<< "$1" + read -r -a "${var_name?}" <<< "$1" ;; --disable \ | --disable-http \ @@ -467,7 +467,7 @@ ensure_apache_app_configuration_exists() { allow_override="None" htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\"" else - allow_override="$allow_override" + # allow_override is already set to the expected value htaccess_include="" fi # ACL configuration @@ -609,7 +609,7 @@ ensure_apache_prefix_configuration_exists() { allow_override="None" htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\"" else - allow_override="$allow_override" + # allow_override is already set to the expected value htaccess_include="" fi # ACL configuration @@ -694,14 +694,18 @@ apache_update_app_configuration() { | --server-aliases) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift - read -r -a "$var_name" <<< "$1" + read -r -a "${var_name?}" <<< "$1" ;; # Common flags - --server-name \ - | --enable-http \ + --enable-http \ | --enable-https \ | --disable-http \ | --disable-https \ + ) + var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" + declare "${var_name}=yes" + ;; + --server-name \ | --http-port \ | --https-port \ ) 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 fc940ac44ee8..4de618688f75 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 @@ -9,6 +9,7 @@ # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) # Load logging library +# shellcheck disable=SC1090,SC1091 . /opt/bitnami/scripts/liblog.sh export BITNAMI_ROOT_DIR="/opt/bitnami" diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh index d2a5349bde0b..813e8c118b0d 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh @@ -9,6 +9,7 @@ # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) # Load logging library +# shellcheck disable=SC1090,SC1091 . /opt/bitnami/scripts/liblog.sh export BITNAMI_ROOT_DIR="/opt/bitnami" diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 88cd2585be54..5ac9983b12bc 100644 --- a/bitnami/phpmyadmin/README.md +++ b/bitnami/phpmyadmin/README.md @@ -42,7 +42,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.1.3`, `5.1.3-debian-10-r38`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.3-debian-10-r38/5/debian-10/Dockerfile) +* [`5`, `5-debian-10`, `5.1.3`, `5.1.3-debian-10-r39`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.3-debian-10-r39/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).