From 770dc7a62148a1d4df15bf13f43a939a4e413c18 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 5 Jun 2026 21:09:13 +0200 Subject: [PATCH] [bitnami/matomo] Release 5.10.1-debian-12-r2 (#94402) Signed-off-by: Bitnami Bot --- bitnami/matomo/5/debian-12/Dockerfile | 10 +++--- ...4.9-10-linux-amd64-debian-12.tar.gz.sha256 | 1 - ...4.9-10-linux-arm64-debian-12.tar.gz.sha256 | 1 - ...4.9-11-linux-amd64-debian-12.tar.gz.sha256 | 1 + ...4.9-11-linux-arm64-debian-12.tar.gz.sha256 | 1 + ....9-165-linux-amd64-debian-12.tar.gz.sha256 | 1 - ....9-165-linux-arm64-debian-12.tar.gz.sha256 | 1 - ....9-166-linux-amd64-debian-12.tar.gz.sha256 | 1 + ....9-166-linux-arm64-debian-12.tar.gz.sha256 | 1 + .../prebuildfs/opt/bitnami/scripts/libos.sh | 2 +- .../opt/bitnami/scripts/libvalidations.sh | 2 +- .../opt/bitnami/scripts/libversion.sh | 33 +++++++++++++++++++ .../bitnami-templates/bitnami-ssl.conf.tpl | 2 +- .../apache/bitnami-templates/bitnami.conf.tpl | 2 +- .../rootfs/opt/bitnami/scripts/libmatomo.sh | 8 +++++ .../opt/bitnami/scripts/libmysqlclient.sh | 27 ++++++++------- .../rootfs/opt/bitnami/scripts/matomo-env.sh | 2 +- bitnami/matomo/README.md | 2 +- 18 files changed, 69 insertions(+), 29 deletions(-) delete mode 100644 bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz.sha256 create mode 100644 bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz.sha256 create mode 100644 bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-amd64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-arm64-debian-12.tar.gz.sha256 create mode 100644 bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 create mode 100644 bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 diff --git a/bitnami/matomo/5/debian-12/Dockerfile b/bitnami/matomo/5/debian-12/Dockerfile index 0e2bfba932d8..5de67f6c8e1d 100644 --- a/bitnami/matomo/5/debian-12/Dockerfile +++ b/bitnami/matomo/5/debian-12/Dockerfile @@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-06-01T13:20:16Z" \ + org.opencontainers.image.created="2026-06-05T18:51:09Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/matomo/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/matomo" \ @@ -28,13 +28,13 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "render-template-1.0.9-165-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.9-166-linux-${OS_ARCH}-debian-12" \ "php-8.4.21-5-linux-${OS_ARCH}-debian-12" \ "apache-2.4.67-1-linux-${OS_ARCH}-debian-12" \ "mysql-client-12.3.2-0-linux-${OS_ARCH}-debian-12" \ "postgresql-lib-18.4.0-0-linux-${OS_ARCH}-debian-12" \ "libphp-8.4.21-0-linux-${OS_ARCH}-debian-12" \ - "ini-file-1.4.9-10-linux-${OS_ARCH}-debian-12" \ + "ini-file-1.4.9-11-linux-${OS_ARCH}-debian-12" \ "matomo-5.10.1-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -62,8 +62,8 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ APP_VERSION="5.10.1" \ BITNAMI_APP_NAME="matomo" \ - IMAGE_REVISION="1" \ - LD_LIBRARY_PATH="/opt/bitnami/postgresql/lib:$LD_LIBRARY_PATH" \ + IMAGE_REVISION="2" \ + LD_LIBRARY_PATH="/opt/bitnami/postgresql/lib" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:$PATH" EXPOSE 8080 8443 diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index f7f6d777442b..000000000000 --- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -7576302f2870643e4c48e7a4be12fef12e472e68b0b407e6033f812c8742c1f1 ini-file-1.4.9-10-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index fd41b7a8f0ce..000000000000 --- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -83dd2355db6b63fc46bb02008fdace7510b339c88d91d45abaa256f2a7ae54bd ini-file-1.4.9-10-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..c67cf7de5e60 --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +4134a42e91271bd0a48f2d6d172910afdfbcaf5251bb8c8bd49e9700aa66d99f ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..51232981438f --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +caafc64b69e970f938d535c3aaf7e66420e0dba2c5cbd332e55ccdfd926eed66 ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index ecf216f2789c..000000000000 --- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -374910c7361f00d393eca79a749d29f389b4522057902c7655f0a3a5ae3d1b32 render-template-1.0.9-165-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index e15b6bdd7577..000000000000 --- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -d492024d2d8261cfb147e7b508d341b91349fd41cf41aecd0706046be8cb108b render-template-1.0.9-165-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..09a2ab4133ea --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +e2467be27e79a387c78b8ef3a57ceaa07bea65009972571f20dcf58631656e0b render-template-1.0.9-166-linux-amd64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..25ae43b180a6 --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +c2c7634c5c0882d2dbd822744f6b5bdb074a07a1abf710c67e1206f1c20b8afa render-template-1.0.9-166-linux-arm64-debian-12.tar.gz diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh @@ -170,7 +170,7 @@ ensure_user_exists() { if [[ -n "$home" ]]; then mkdir -p "$home" usermod -d "$home" "$user" >/dev/null 2>&1 - configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" + configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n fi } diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -20,7 +20,7 @@ ######################### is_int() { local -r int="${1:?missing value}" - if [[ "$int" =~ ^-?[0-9]+ ]]; then + if [[ "$int" =~ ^-?[0-9]+$ ]]; then true else false diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -49,3 +49,36 @@ get_sematic_version () { fi fi } + +######################## +# Compares two semantic versions +# Arguments: +# $1 - version1: first version to compare +# $2 - version2: second version to compare +# Returns: +# -1 if version1 is less than version2 +# 0 if version1 is equal to version2 +# 1 if version1 is greater than version2 +######################### +compare_semantic_versions() { + local version1="${1:?version1 is required}" + local version2="${2:?version2 is required}" + local major1 major2 minor1 minor2 patch1 patch2 + + major1="$(get_sematic_version "$version1" 1)" + major2="$(get_sematic_version "$version2" 1)" + minor1="$(get_sematic_version "$version1" 2)" + minor2="$(get_sematic_version "$version2" 2)" + patch1="$(get_sematic_version "$version1" 3)" + patch2="$(get_sematic_version "$version2" 3)" + + if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then + echo "0" + elif [[ "$major1" -lt "$major2" ]] || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then + echo "-1" + else + echo "1" + fi +} diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl index a830382f2dd3..66d6deb84f29 100644 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl @@ -21,7 +21,7 @@ SSLSessionCacheTimeout 300 SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/tls.key" - Options Indexes FollowSymLinks + Options FollowSymLinks AllowOverride All Require all granted diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl index 75a255c3efee..73d73314f8a3 100644 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl @@ -6,7 +6,7 @@ SetEnvIf X-Forwarded-Proto https HTTPS=on DocumentRoot "{{APACHE_BASE_DIR}}/htdocs" - Options Indexes FollowSymLinks + Options FollowSymLinks AllowOverride All Require all granted diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmatomo.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmatomo.sh index 796f34eb7fe9..e663e8c90580 100644 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmatomo.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmatomo.sh @@ -357,6 +357,10 @@ matomo_pass_wizard() { wizard_url="http://127.0.0.1:${port}/" cookie_file="/tmp/cookie$(generate_random_string -t alphanumeric -c 8)" curl_opts=("--location" "--silent" "--cookie" "$cookie_file" "--cookie-jar" "$cookie_file") + # Disable remote access during wizard setup + for vhost in "matomo-vhost.conf" "matomo-https-vhost.conf"; do + replace_in_file "/opt/bitnami/apache/conf/vhosts/$vhost" "Require all granted" "Require local" + done # Ensure the web server is started web_server_start info "Passing Matomo installation wizard" @@ -431,4 +435,8 @@ matomo_pass_wizard() { fi # Stop the web server afterwards web_server_stop + # Enable remote access again + for vhost in "matomo-vhost.conf" "matomo-https-vhost.conf"; do + replace_in_file "/opt/bitnami/apache/conf/vhosts/$vhost" "Require local" "Require all granted" + done } diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh index 1a3ae0d0dc67..97ab588065ce 100644 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -263,12 +263,6 @@ mysql_execute_print_output() { fi args+=("-N" "-u" "$user") [[ -n "$db" ]] && args+=("$db") - # Avoid passing credentials as arguments to mysql, to avoid leaking them given a local observer with /proc read access can read them - if [[ -n "$pass" ]]; then - local pass_file - pass_file="$(credential_to_temp_file "$pass")" - args+=("-p$(<"$pass_file")") - fi [[ "${#opts[@]}" -gt 0 ]] && args+=("${opts[@]}") [[ "${#extra_opts[@]}" -gt 0 ]] && args+=("${extra_opts[@]}") @@ -276,11 +270,19 @@ mysql_execute_print_output() { if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then local mysql_cmd mysql_cmd="$(