From 9bdbb1b17560ac35acb5082af79210592ac0f0c9 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 9 Jun 2025 11:07:58 +0200 Subject: [PATCH] [bitnami/matomo] Release 5.3.2-debian-12-r5 (#82123) Signed-off-by: Bitnami Bot --- bitnami/matomo/5/debian-12/Dockerfile | 10 +++---- .../opt/bitnami/.bitnami_components.json | 6 ++--- .../prebuildfs/usr/sbin/uninstall_packages | 26 +++++++++++++++++++ bitnami/matomo/README.md | 22 ++++++++-------- 4 files changed, 45 insertions(+), 19 deletions(-) create mode 100755 bitnami/matomo/5/debian-12/prebuildfs/usr/sbin/uninstall_packages diff --git a/bitnami/matomo/5/debian-12/Dockerfile b/bitnami/matomo/5/debian-12/Dockerfile index e460876d9bd0..a1bf66dd6175 100644 --- a/bitnami/matomo/5/debian-12/Dockerfile +++ b/bitnami/matomo/5/debian-12/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-05-30T15:15:57Z" \ + org.opencontainers.image.created="2025-06-09T06:50:55Z" \ 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.ref.name="5.3.2-debian-12-r4" \ + org.opencontainers.image.ref.name="5.3.2-debian-12-r5" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/matomo" \ org.opencontainers.image.title="matomo" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -28,12 +28,12 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi8 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhashkit2 libhogweed6 libicu72 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.5-0 libldap-common liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl3 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp7 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 libzstd1 openssl procps rsync zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "render-template-1.0.7-16-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.7-17-linux-${OS_ARCH}-debian-12" \ "php-8.2.28-8-linux-${OS_ARCH}-debian-12" \ - "apache-2.4.63-4-linux-${OS_ARCH}-debian-12" \ + "apache-2.4.63-5-linux-${OS_ARCH}-debian-12" \ "mysql-client-11.4.7-0-linux-${OS_ARCH}-debian-12" \ "libphp-8.2.28-2-linux-${OS_ARCH}-debian-12" \ - "ini-file-1.4.7-16-linux-${OS_ARCH}-debian-12" \ + "ini-file-1.4.7-17-linux-${OS_ARCH}-debian-12" \ "matomo-5.3.2-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 220fb517c7b1..8fe376022919 100644 --- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,13 +3,13 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "2.4.63-4" + "version": "2.4.63-5" }, "ini-file": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.4.7-16" + "version": "1.4.7-17" }, "libphp": { "arch": "amd64", @@ -39,6 +39,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.7-16" + "version": "1.0.7-17" } } \ No newline at end of file diff --git a/bitnami/matomo/5/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/matomo/5/debian-12/prebuildfs/usr/sbin/uninstall_packages new file mode 100755 index 000000000000..615c430e4e68 --- /dev/null +++ b/bitnami/matomo/5/debian-12/prebuildfs/usr/sbin/uninstall_packages @@ -0,0 +1,26 @@ +#!/bin/sh +# Copyright Broadcom, Inc. All Rights Reserved. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get autoremove --purge -y "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/matomo/README.md b/bitnami/matomo/README.md index 2d7c38adce6a..72b26ffcdb39 100644 --- a/bitnami/matomo/README.md +++ b/bitnami/matomo/README.md @@ -138,12 +138,12 @@ services: mariadb: ... volumes: - - '/path/to/mariadb-persistence:/bitnami' + - /path/to/mariadb-persistence:/bitnami ... matomo: ... volumes: - - '/path/to/matomo-persistence:/bitnami' + - /path/to/matomo-persistence:/bitnami ... ``` @@ -465,13 +465,13 @@ Based on the extended image, you can use a Docker Compose file like the one belo version: '2' services: mariadb: - image: 'bitnami/mariadb:10.11' + image: bitnami/mariadb:latest environment: - MARIADB_USER=bn_matomo - MARIADB_DATABASE=bitnami_matomo - ALLOW_EMPTY_PASSWORD=yes volumes: - - 'mariadb_data:/bitnami' + - mariadb_data:/bitnami matomo: build: . environment: @@ -481,12 +481,12 @@ services: - MATOMO_DATABASE_NAME=bitnami_matomo - ALLOW_EMPTY_PASSWORD=yes ports: - - '80:8181' - - '443:8143' + - 80:8181 + - 443:8143 depends_on: - mariadb volumes: - - 'matomo_data:/bitnami' + - matomo_data:/bitnami volumes: mariadb_data: driver: local @@ -514,10 +514,10 @@ To upgrade a previous Bitnami Matomo container image, which did not support non- - ALLOW_EMPTY_PASSWORD=yes + user: root ports: -- - '80:80' -- - '443:443' -+ - '80:8080' -+ - '443:8443' +- - 80:80 +- - 443:443 ++ - 80:8080 ++ - 443:8443 volumes: ```