diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index d577d1c8b26e..a410ce0b64d8 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -8,7 +8,7 @@ COPY prebuildfs / RUN install_packages ca-certificates curl dirmngr gnupg libbz2-1.0 libc6 libcom-err2 libcurl4 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libp11-kit0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libxml2 libxslt1.1 libzip4 procps sudo unzip zlib1g RUN /build/bitnami-user.sh && \ /build/install-nami.sh -RUN bitnami-pkg unpack apache-2.4.41-0 --checksum 0364e80e08a89fda2d2d302609f813d5d497b6cb6bcf6643d2770b825abbc0fb +RUN bitnami-pkg unpack apache-2.4.41-1 --checksum 2139963ce8e8fa949271b4ac7967b783b76a4aab87dfccb8a6f6715fc96a15d1 RUN bitnami-pkg unpack php-7.3.15-0 --checksum 631e0e01ec4f935b714d48f61a71d29284e9c159ca928475ef51e36f6de0d909 RUN bitnami-pkg install libphp-7.3.15-0 --checksum c96f4cd9a52432202120b0e80b867edab40f74d7f478d46278c49d23aecd2f59 RUN bitnami-pkg unpack phpmyadmin-5.0.1-0 --checksum f549e035685cb1bdb768793f201a53ce54f41033df2b31f0eba1af3db8f34cd7 @@ -18,12 +18,11 @@ RUN /build/install-gosu.sh RUN /build/install-tini.sh COPY rootfs / -ENV APACHE_HTTPS_PORT_NUMBER="" \ - APACHE_HTTP_PORT_NUMBER="" \ - APACHE_SET_HTTPS_PORT="no" \ - APACHE_SET_HTTP_PORT="no" \ +ENV APACHE_ENABLE_CUSTOM_PORTS="no" \ + APACHE_HTTPS_PORT_NUMBER="443" \ + APACHE_HTTP_PORT_NUMBER="80" \ BITNAMI_APP_NAME="phpmyadmin" \ - BITNAMI_IMAGE_VERSION="5.0.1-debian-10-r31" \ + BITNAMI_IMAGE_VERSION="5.0.1-debian-10-r32" \ DATABASE_ENABLE_SSL="no" \ DATABASE_HOST="mariadb" \ DATABASE_PORT_NUMBER="3306" \ diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/build/bitnami-user.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/build/bitnami-user.sh index ab84296bcdfa..0b21a219a4f3 100755 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/build/bitnami-user.sh +++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/build/bitnami-user.sh @@ -1,6 +1,6 @@ #!/bin/bash useradd -ms /bin/bash bitnami -mkdir -p /opt/bitnami && chown bitnami:bitnami /opt/bitnami +mkdir -p /opt/bitnami sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/apache-init.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/apache-init.sh index 940efb6d8576..b22b41cc9e72 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/apache-init.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/apache-init.sh @@ -1,11 +1,8 @@ #!/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" +if [[ -n "${APACHE_HTTP_PORT_NUMBER:-}" || -n "${APACHE_HTTPS_PORT_NUMBER:-}" ]]; then + export APACHE_ENABLE_CUSTOM_PORTS="yes" fi # Copy vhosts file diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/apache-inputs.json b/bitnami/phpmyadmin/5/debian-10/rootfs/apache-inputs.json index 25e01aaf4e76..77ab9593775e 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/apache-inputs.json +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/apache-inputs.json @@ -1,6 +1,5 @@ { + "enableCustomPorts": "{{$global.env.APACHE_ENABLE_CUSTOM_PORTS}}", "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}", - "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}", - "setHttpPort": "{{$global.env.APACHE_SET_HTTP_PORT}}", - "setHttpsPort": "{{$global.env.APACHE_SET_HTTPS_PORT}}" + "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}" } \ No newline at end of file diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 0a6672c0253b..02eb4b08fbf9 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/containers/how-to/understand-rolling-tags-containers/). -* [`5-debian-10`, `5.0.1-debian-10-r31`, `5`, `5.0.1`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.1-debian-10-r31/5/debian-10/Dockerfile) +* [`5-debian-10`, `5.0.1-debian-10-r32`, `5`, `5.0.1`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.1-debian-10-r32/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).