diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index d3880302d464..25c229e79ed1 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -8,11 +8,11 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages acl ca-certificates curl gzip libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmcrypt4 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 libuuid1 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.15-4" --checksum cc8101ce6c4c08f00f6f6a1f21dee533513888d757387ab135e95cd5eb884438 +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 libxml2 libxslt1.1 libzip4 procps tar zlib1g +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.2-5" --checksum 46a474412b505882733f37553298480aa58825e33074637665123625c98457a4 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-5" --checksum f6663ef2cd47d80d63af1da7ff319ed94afe8a825115b2f52894d799013b551c RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.28-0" --checksum 9398376ca9e2033d5bc193232e8aa9b57d91d4ccf06fa67bfa0d30ef36e44c25 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.15-1" --checksum 8ae456c7183e301493d75ec3d0ac9b17439aedd37c6cc6f26178b82653a89125 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "8.0.2-2" --checksum 67857f144ebafa0e9f0f3f6ebf645620c2279508183a9a3a15fdbf4cb7c263c0 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 "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50 @@ -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-r0" \ + BITNAMI_IMAGE_VERSION="5.1.0-debian-10-r1" \ 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 04b585e0a153..2dfd6aea2426 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": "8ae456c7183e301493d75ec3d0ac9b17439aedd37c6cc6f26178b82653a89125", + "digest": "67857f144ebafa0e9f0f3f6ebf645620c2279508183a9a3a15fdbf4cb7c263c0", "distro": "debian-10", "type": "NAMI", - "version": "7.4.15-1" + "version": "8.0.2-2" }, "mysql-client": { "arch": "amd64", @@ -29,10 +29,10 @@ }, "php": { "arch": "amd64", - "digest": "cc8101ce6c4c08f00f6f6a1f21dee533513888d757387ab135e95cd5eb884438", + "digest": "46a474412b505882733f37553298480aa58825e33074637665123625c98457a4", "distro": "debian-10", "type": "NAMI", - "version": "7.4.15-4" + "version": "8.0.2-5" }, "phpmyadmin": { "arch": "amd64", diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh index 7a907f80b477..8b5bb7a7dd58 100755 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh @@ -8,6 +8,7 @@ set -o pipefail # set -o xtrace # Uncomment this line for debugging purpose # Load libraries +. /opt/bitnami/scripts/libversion.sh . /opt/bitnami/scripts/libapache.sh # Load Apache environment @@ -16,7 +17,13 @@ set -o pipefail # Enable required Apache modules apache_enable_module "mpm_prefork_module" -apache_enable_module "php7_module" "modules/libphp7.so" +php_version="$("${PHP_BIN_DIR}/php" -v | grep ^PHP | cut -d' ' -f2))" +php_major_version="$(get_sematic_version "$php_version" 1)" +if [[ "$php_major_version" -eq "8" ]]; then + apache_enable_module "php_module" "modules/libphp.so" +else + apache_enable_module "php${php_major_version}_module" "modules/libphp${php_major_version}.so" +fi # Disable incompatible Apache modules apache_disable_module "mpm_event_module" diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index d7140a57c336..1b9c19104d33 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-r0`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.0-debian-10-r0/5/debian-10/Dockerfile) +* [`5`, `5-debian-10`, `5.1.0`, `5.1.0-debian-10-r1`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.0-debian-10-r1/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).