diff --git a/bitnami/matomo/4/debian-10/Dockerfile b/bitnami/matomo/4/debian-10/Dockerfile index bc69f4f3dbc3..6b1ba6563717 100644 --- a/bitnami/matomo/4/debian-10/Dockerfile +++ b/bitnami/matomo/4/debian-10/Dockerfile @@ -9,10 +9,10 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates cron curl gzip libargon2-1 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 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 rsync tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.27-4" --checksum ddf457d94e488cf2009c9b85d8fe9b7f471947eb95230561dbddfb1789327e71 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.27-5" --checksum 26a89b152b8e73d5301a7d5b136dcfe023a46743e892edfb94a6d34ba83f4726 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.3.27-1" --checksum 92d2a0e197d171c0661a66f9e25ae6ca2f91dd6edf1c319b8e152929299c837d +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.27-2" --checksum 136766df799e2acb375a4b2b46eb8b7e27899287f8dd22bfd8f205d6bea3c59d RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ini-file" "1.3.0-2" --checksum d89528e5d733f34ae030984584659ff10a36370d40332bd8d41c047764d39cda RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "matomo" "4.2.1-0" --checksum c79aa95d7820ed79786ebdc2adae6692a51bf35cc0976ced3d59a389ff6ba560 @@ -21,8 +21,8 @@ RUN chmod g+rwX /opt/bitnami RUN sed -i -e '/pam_loginuid.so/ s/^#*/#/' /etc/pam.d/cron 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/matomo/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh @@ -31,7 +31,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="matomo" \ - BITNAMI_IMAGE_VERSION="4.2.1-debian-10-r2" \ + BITNAMI_IMAGE_VERSION="4.2.1-debian-10-r3" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/matomo/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/matomo/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 5a6232e3a131..5a4b4a5d6df5 100644 --- a/bitnami/matomo/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/matomo/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -22,10 +22,10 @@ }, "libphp": { "arch": "amd64", - "digest": "92d2a0e197d171c0661a66f9e25ae6ca2f91dd6edf1c319b8e152929299c837d", + "digest": "136766df799e2acb375a4b2b46eb8b7e27899287f8dd22bfd8f205d6bea3c59d", "distro": "debian-10", "type": "NAMI", - "version": "7.3.27-1" + "version": "7.3.27-2" }, "matomo": { "arch": "amd64", @@ -43,10 +43,10 @@ }, "php": { "arch": "amd64", - "digest": "ddf457d94e488cf2009c9b85d8fe9b7f471947eb95230561dbddfb1789327e71", + "digest": "26a89b152b8e73d5301a7d5b136dcfe023a46743e892edfb94a6d34ba83f4726", "distro": "debian-10", "type": "NAMI", - "version": "7.3.27-4" + "version": "7.3.27-5" }, "render-template": { "arch": "amd64", diff --git a/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh b/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh index 7a907f80b477..8b5bb7a7dd58 100755 --- a/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh +++ b/bitnami/matomo/4/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/matomo/README.md b/bitnami/matomo/README.md index ac3673e56c79..872534282153 100644 --- a/bitnami/matomo/README.md +++ b/bitnami/matomo/README.md @@ -36,7 +36,7 @@ Non-root container images add an extra layer of security and are generally recom 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/). -* [`4`, `4-debian-10`, `4.2.1`, `4.2.1-debian-10-r2`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-matomo/blob/4.2.1-debian-10-r2/4/debian-10/Dockerfile) +* [`4`, `4-debian-10`, `4.2.1`, `4.2.1-debian-10-r3`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-matomo/blob/4.2.1-debian-10-r3/4/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/matomo GitHub repo](https://github.com/bitnami/bitnami-docker-matomo).