diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index 4e8a486f50e4..b0d567485578 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -9,18 +9,18 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libaudit1 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libwebp6 libxml2 libxslt1.1 libzip4 procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.6-0" --checksum 7ac98ae9584f36bda20d2a29d8da24cb688afc8c8c098603bbe4074432a98680 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.7-0" --checksum d045162e373a1975562f02c81ec25562732ed13054f68c57ac41c21adfc7bb7b RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.48-0" --checksum 85aa9ec2b419b3e53b5aa8f8e52bb35cddba3a646f204dfaec029e292d250017 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.29-0" --checksum 5bf8f1ed022c8ad75a4db5b8b72ae54ce427bff628d7e4025c5b5e67b876708d -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "8.0.6-1" --checksum bda874210a9070b5befaf36380ebb5aea444622864f33379c97eecc61e08fed9 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "8.0.7-0" --checksum 36421004fa886c335999d096173aeda1e852c5b31e671b681d0b848858182f43 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "phpmyadmin" "5.1.0-1" --checksum 6a1e65be5ec0a38dd8035a4e47509047cc19c8c0f00c31945694afd2abd3d998 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "phpmyadmin" "5.1.1-0" --checksum b2dbf36aeb64d28e1ae862d63185419c92ec957d8534cdbc5bb2076a78858856 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50 RUN chmod g+rwX /opt/bitnami COPY rootfs / -RUN /opt/bitnami/scripts/apache/postunpack.sh RUN /opt/bitnami/scripts/php/postunpack.sh +RUN /opt/bitnami/scripts/apache/postunpack.sh RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh RUN /opt/bitnami/scripts/phpmyadmin/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ @@ -28,7 +28,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="phpmyadmin" \ - BITNAMI_IMAGE_VERSION="5.1.0-debian-10-r84" \ + BITNAMI_IMAGE_VERSION="5.1.1-debian-10-r0" \ 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 7ba4e31af4b9..6f6d7cbebd9a 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 @@ -15,10 +15,10 @@ }, "libphp": { "arch": "amd64", - "digest": "bda874210a9070b5befaf36380ebb5aea444622864f33379c97eecc61e08fed9", + "digest": "36421004fa886c335999d096173aeda1e852c5b31e671b681d0b848858182f43", "distro": "debian-10", "type": "NAMI", - "version": "8.0.6-1" + "version": "8.0.7-0" }, "mysql-client": { "arch": "amd64", @@ -29,17 +29,17 @@ }, "php": { "arch": "amd64", - "digest": "7ac98ae9584f36bda20d2a29d8da24cb688afc8c8c098603bbe4074432a98680", + "digest": "d045162e373a1975562f02c81ec25562732ed13054f68c57ac41c21adfc7bb7b", "distro": "debian-10", "type": "NAMI", - "version": "8.0.6-0" + "version": "8.0.7-0" }, "phpmyadmin": { "arch": "amd64", - "digest": "6a1e65be5ec0a38dd8035a4e47509047cc19c8c0f00c31945694afd2abd3d998", + "digest": "b2dbf36aeb64d28e1ae862d63185419c92ec957d8534cdbc5bb2076a78858856", "distro": "debian-10", "type": "NAMI", - "version": "5.1.0-1" + "version": "5.1.1-0" }, "render-template": { "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 1280134f015c..dc322c377b1b 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 @@ -177,6 +177,10 @@ web_server_reload() { # --apache-before-vhost-configuration - Configuration to add before the directive (no default) # --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no') # --apache-extra-directory-configuration - Extra configuration for the document root directory +# --apache-proxy-address - Address where to proxy requests +# --apache-proxy-configuration - Extra configuration for the proxy +# --apache-proxy-http-configuration - Extra configuration for the proxy HTTP vhost +# --apache-proxy-https-configuration - Extra configuration for the proxy HTTPS vhost # --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup # NGINX-specific flags: # --nginx-additional-configuration - Additional server block configuration (no default) @@ -214,6 +218,9 @@ ensure_web_server_app_configuration_exists() { | --apache-allow-override \ | --apache-extra-directory-configuration \ | --apache-proxy-address \ + | --apache-proxy-configuration \ + | --apache-proxy-http-configuration \ + | --apache-proxy-https-configuration \ | --apache-move-htaccess \ ) apache_args+=("${1//apache-/}" "${2:?missing value}") diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl index 6c320e3f60e6..23ba583683d2 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl @@ -1,5 +1,8 @@ +{{before_vhost_configuration}} ServerAlias * + {{proxy_configuration}} + {{proxy_http_configuration}} ProxyPass / {{proxy_address}} ProxyPassReverse / {{proxy_address}} {{additional_configuration}} diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl index 2273f610dfad..cb18f5cf77e8 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl @@ -1,7 +1,11 @@ +{{before_vhost_configuration}} ServerAlias * + SSLEngine on SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + {{proxy_configuration}} + {{proxy_https_configuration}} ProxyPass / {{proxy_address}} ProxyPassReverse / {{proxy_address}} {{additional_configuration}} diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl index ffd0e72183c8..7ac08b131680 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl @@ -3,6 +3,7 @@ Options -Indexes +FollowSymLinks -MultiViews AllowOverride {{allow_override}} {{acl_configuration}} + {{proxy_configuration}} ProxyPass / {{proxy_address}} ProxyPassReverse / {{proxy_address}} {{extra_directory_configuration}} 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 18146f226eeb..3374c0a702c4 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 @@ -330,6 +330,10 @@ EOF # --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no') # --document-root - Path to document root directory # --extra-directory-configuration - Extra configuration for the document root directory +# --proxy-address - Address where to proxy requests +# --proxy-configuration - Extra configuration for the proxy +# --proxy-http-configuration - Extra configuration for the proxy HTTP vhost +# --proxy-https-configuration - Extra configuration for the proxy HTTPS vhost # Returns: # true if the configuration was enabled, false otherwise ######################## @@ -352,6 +356,9 @@ ensure_apache_app_configuration_exists() { export document_root="${BITNAMI_ROOT_DIR}/${app}" export extra_directory_configuration="" export proxy_address="" + export proxy_configuration="" + export proxy_http_configuration="" + export proxy_https_configuration="" # Validate arguments shift while [[ "$#" -gt 0 ]]; do @@ -373,6 +380,9 @@ ensure_apache_app_configuration_exists() { | --document-root \ | --extra-directory-configuration \ | --proxy-address \ + | --proxy-configuration \ + | --proxy-http-configuration \ + | --proxy-https-configuration \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 02c60fcce0d3..1773494e0bcf 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.1.0`, `5.1.0-debian-10-r84`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.0-debian-10-r84/5/debian-10/Dockerfile) +* [`5`, `5-debian-10`, `5.1.1`, `5.1.1-debian-10-r0`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.1-debian-10-r0/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).