diff --git a/bitnami/matomo/4/debian-10/Dockerfile b/bitnami/matomo/4/debian-10/Dockerfile index 5915fc35540b..1dcac0c0d5df 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 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 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps rsync tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.24-5" --checksum e9c8baef629a858d404b0fe58725650c2f9c282da7735ee6477bd9633c00089c +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.25-0" --checksum a1e8ddaa11e536455db0af843ed8153ba2959c165e662ff4d489537e9b0fa82b RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.51-0" --checksum 71010c86332e4ad0993bc875d103bb916184f1f42884a9098db65c969553c34a RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.31-2" --checksum 15b394a022ca1d0b4b89bfee0487ee13f9e8cc697d0ca09ce62a0a3732536236 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.24-3" --checksum 534aa93850b658381e8ef85dd9cdb64c097eb7938d733640ac92f65263cb5dec +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.25-0" --checksum 94230b4abfeff6424103c40676c7162330c338b03b4f1a77f07eba709e650e35 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ini-file" "1.4.0-0" --checksum 88093e848950fd09e80eb26cac55caa11e77aa78f118b5dc67faa38a3836381d 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.5.0-0" --checksum 0d74aa0ae1da5e66eeffeaa4b56f0bd0e738b341dcbb65b7665ddefd8da435bf @@ -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/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/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.5.0-debian-10-r13" \ + BITNAMI_IMAGE_VERSION="4.5.0-debian-10-r14" \ 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 8c592be76325..e62e2ac5a559 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": "534aa93850b658381e8ef85dd9cdb64c097eb7938d733640ac92f65263cb5dec", + "digest": "94230b4abfeff6424103c40676c7162330c338b03b4f1a77f07eba709e650e35", "distro": "debian-10", "type": "NAMI", - "version": "7.4.24-3" + "version": "7.4.25-0" }, "matomo": { "arch": "amd64", @@ -43,10 +43,10 @@ }, "php": { "arch": "amd64", - "digest": "e9c8baef629a858d404b0fe58725650c2f9c282da7735ee6477bd9633c00089c", + "digest": "a1e8ddaa11e536455db0af843ed8153ba2959c165e662ff4d489537e9b0fa82b", "distro": "debian-10", "type": "NAMI", - "version": "7.4.24-5" + "version": "7.4.25-0" }, "render-template": { "arch": "amd64", diff --git a/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/libphp.sh index c0a910a20394..a9bd719ef266 100644 --- a/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/libphp.sh +++ b/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/libphp.sh @@ -78,6 +78,7 @@ php_initialize() { php_set_runtime_config() { local -r conf_file="${1:?missing conf file}" + ! is_empty_value "$PHP_DATE_TIMEZONE" && info "Setting PHP date.timezone option" && php_conf_set date.timezone "$PHP_DATE_TIMEZONE" "$conf_file" ! is_empty_value "$PHP_ENABLE_OPCACHE" && info "Setting PHP opcache.enable option" && php_conf_set opcache.enable "$PHP_ENABLE_OPCACHE" "$conf_file" ! is_empty_value "$PHP_EXPOSE_PHP" && info "Setting PHP expose_php option" && php_conf_set expose_php "$PHP_EXPOSE_PHP" "$conf_file" ! is_empty_value "$PHP_MAX_EXECUTION_TIME" && info "Setting PHP max_execution_time option" && php_conf_set max_execution_time "$PHP_MAX_EXECUTION_TIME" "$conf_file" diff --git a/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/php-env.sh index d38b3b2e02c9..038af0c8d252 100644 --- a/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/php-env.sh +++ b/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/php-env.sh @@ -22,6 +22,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" # variable will be overridden with the value specified in that file php_env_vars=( PHP_FPM_LISTEN_ADDRESS + PHP_DATE_TIMEZONE PHP_ENABLE_OPCACHE PHP_EXPOSE_PHP PHP_MAX_EXECUTION_TIME @@ -72,6 +73,7 @@ export PHP_FPM_DAEMON_USER="daemon" export PHP_FPM_DAEMON_GROUP="daemon" # PHP configuration +export PHP_DATE_TIMEZONE="${PHP_DATE_TIMEZONE:-}" PHP_ENABLE_OPCACHE="${PHP_ENABLE_OPCACHE:-"${PHP_OPCACHE_ENABLED:-}"}" export PHP_ENABLE_OPCACHE="${PHP_ENABLE_OPCACHE:-}" export PHP_EXPOSE_PHP="${PHP_EXPOSE_PHP:-}" diff --git a/bitnami/matomo/README.md b/bitnami/matomo/README.md index eae9c32bbb56..da22722db3ac 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.5.0`, `4.5.0-debian-10-r13`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-matomo/blob/4.5.0-debian-10-r13/4/debian-10/Dockerfile) +* [`4`, `4-debian-10`, `4.5.0`, `4.5.0-debian-10-r14`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-matomo/blob/4.5.0-debian-10-r14/4/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/matomo GitHub repo](https://github.com/bitnami/bitnami-docker-matomo).