From 611fb8230afeec874d317db34d73f446cfb2532e Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 18 Feb 2025 16:01:49 +0100 Subject: [PATCH] [bitnami/matomo] Release matomo-5.2.2-debian-12-r3 (#77678) Signed-off-by: Bitnami Bot --- bitnami/matomo/5/debian-12/Dockerfile | 8 +-- .../opt/bitnami/.bitnami_components.json | 4 +- .../rootfs/opt/bitnami/scripts/libmatomo.sh | 13 ++-- .../rootfs/opt/bitnami/scripts/matomo-env.sh | 1 - bitnami/matomo/README.md | 72 +++++++++---------- 5 files changed, 48 insertions(+), 50 deletions(-) diff --git a/bitnami/matomo/5/debian-12/Dockerfile b/bitnami/matomo/5/debian-12/Dockerfile index 139265ad3330..12c39dd7a17d 100644 --- a/bitnami/matomo/5/debian-12/Dockerfile +++ b/bitnami/matomo/5/debian-12/Dockerfile @@ -8,11 +8,11 @@ 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-02-11T13:52:18Z" \ + org.opencontainers.image.created="2025-02-18T14:29:16Z" \ 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.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.2.2-debian-12-r2" \ + org.opencontainers.image.ref.name="5.2.2-debian-12-r3" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/matomo" \ org.opencontainers.image.title="matomo" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -29,12 +29,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/ ; \ COMPONENTS=( \ - "render-template-1.0.7-11-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.7-12-linux-${OS_ARCH}-debian-12" \ "php-8.2.27-8-linux-${OS_ARCH}-debian-12" \ "apache-2.4.63-0-linux-${OS_ARCH}-debian-12" \ "mysql-client-10.11.11-0-linux-${OS_ARCH}-debian-12" \ "libphp-8.2.27-1-linux-${OS_ARCH}-debian-12" \ - "ini-file-1.4.7-11-linux-${OS_ARCH}-debian-12" \ + "ini-file-1.4.7-12-linux-${OS_ARCH}-debian-12" \ "matomo-5.2.2-0-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 3cbcf313d1e3..c94c3b670ab1 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 @@ -9,7 +9,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.4.7-11" + "version": "1.4.7-12" }, "libphp": { "arch": "amd64", @@ -39,6 +39,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.7-11" + "version": "1.0.7-12" } } \ No newline at end of file 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 5dda2f00e2ae..c3d027082ec6 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 @@ -219,13 +219,12 @@ EOF info "Persisted Matomo installation detected" info "Updating Matomo files in persisted data" rsync_args=("-a" "$MATOMO_BASE_DIR"/* "$MATOMO_VOLUME_DIR" "--exclude" "$(realpath --relative-to="$MATOMO_BASE_DIR" "$MATOMO_CONF_FILE")") - if [[ -n "$MATOMO_EXCLUDED_DATA_FROM_UPDATE" ]]; then - for file in $MATOMO_EXCLUDED_DATA_FROM_UPDATE; do - rsync_args+=("--exclude") - rsync_args+=("$(realpath --relative-to="$MATOMO_BASE_DIR" "$file")") - done - fi - rsync "${rsync_args[@]}" + read -r -a extra_excluded_data <<< "$(tr ',;:' ' ' <<< "$MATOMO_EXCLUDED_DATA_FROM_UPDATE")" + for file in "${extra_excluded_data[@]}"; do + rsync_args+=("--exclude") + rsync_args+=("$(realpath --relative-to="$MATOMO_BASE_DIR" "$file")") + done + rsync "${rsync_args[@]}" info "Restoring Matomo installation" restore_persisted_app "$app_name" "$MATOMO_DATA_TO_PERSIST" info "Trying to connect to the database server" diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/matomo-env.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/matomo-env.sh index bfb7d8243483..9866ed33a76e 100644 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/matomo-env.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/matomo-env.sh @@ -89,7 +89,6 @@ export MATOMO_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/matomo" export MATOMO_DATA_TO_PERSIST="${MATOMO_DATA_TO_PERSIST:-$MATOMO_BASE_DIR}" export MATOMO_EXCLUDED_DATA_FROM_UPDATE="${MATOMO_EXCLUDED_DATA_FROM_UPDATE:-}" - # Matomo configuration export MATOMO_SKIP_BOOTSTRAP="${MATOMO_SKIP_BOOTSTRAP:-}" # only used during the first initialization diff --git a/bitnami/matomo/README.md b/bitnami/matomo/README.md index a406a2187916..3dc0bc49b445 100644 --- a/bitnami/matomo/README.md +++ b/bitnami/matomo/README.md @@ -275,42 +275,42 @@ Bitnami provides up-to-date versions of MariaDB and Matomo, including security p #### Customizable environment variables -| Name | Description | Default Value | -|----------------------------------------|------------------------------------------------------------------------------------------------------------------------------|---------------------------------| -| `MATOMO_DATA_TO_PERSIST` | Files to persist relative to the Matomo installation directory. To provide multiple values, separate them with a whitespace. | `$MATOMO_BASE_DIR` | -| `MATOMO_EXCLUDED_DATA_FROM_UPDATE` | Files to exclude from being updated relative to the Matomo installation directory (same as config.ini.php). To provide multiple values, separate them with a whitespace. No defaults. | `nil` | -| `MATOMO_SKIP_BOOTSTRAP` | Whether to perform initial bootstrapping for the application. | `nil` | -| `MATOMO_PROXY_HOST_HEADER` | Specify the host IP HTTP Header. Usually HTTP_X_FORWARDED_HOST. No defaults. | `nil` | -| `MATOMO_PROXY_CLIENT_HEADER` | Specify the client IP HTTP Header. Usually HTTP_X_FORWARDED_FOR. | `nil` | -| `MATOMO_ENABLE_ASSUME_SECURE_PROTOCOL` | Enable assume_secure_protocol in Matomo configuration file. | `no` | -| `MATOMO_ENABLE_FORCE_SSL` | Enable force_ssl in Matomo configuration file. | `no` | -| `MATOMO_ENABLE_PROXY_URI_HEADER` | Enable proxy_uri_header in Matomo configuration file. | `no` | -| `MATOMO_USERNAME` | Matomo user name. | `user` | -| `MATOMO_PASSWORD` | Matomo user password. | `bitnami` | -| `MATOMO_EMAIL` | Matomo user e-mail address. | `user@example.com` | -| `MATOMO_HOST` | Name of a website to track in Matomo. | `127.0.0.1` | -| `MATOMO_WEBSITE_NAME` | Name of a website to track in Matomo. | `example` | -| `MATOMO_WEBSITE_HOST` | Website host or domain to track in Matomo. | `https://example.org` | -| `MATOMO_ENABLE_TRUSTED_HOST_CHECK` | Enable trusted host check. | `no` | -| `MATOMO_ENABLE_DATABASE_SSL` | Whether to enable SSL for database connections in the Matomo configuration file. | `no` | -| `MATOMO_DATABASE_SSL_CA_FILE` | Path to the database server CA bundle file. | `nil` | -| `MATOMO_DATABASE_SSL_CERT_FILE` | Path to the database client certificate file. | `nil` | -| `MATOMO_DATABASE_SSL_KEY_FILE` | Path to the database client certificate key | `nil` | -| `MATOMO_VERIFY_DATABASE_SSL` | Whether to verify the database SSL certificate when SSL is enabled | `yes` | -| `MATOMO_SMTP_HOST` | Matomo SMTP server host. | `nil` | -| `MATOMO_SMTP_PORT_NUMBER` | Matomo SMTP server port number. | `nil` | -| `MATOMO_SMTP_USER` | Matomo SMTP server user. | `nil` | -| `MATOMO_SMTP_PASSWORD` | Matomo SMTP server user password. | `nil` | -| `MATOMO_SMTP_AUTH` | Matomo SMTP server auth type | `nil` | -| `MATOMO_SMTP_PROTOCOL` | Matomo SMTP server protocol to use. | `nil` | -| `MATOMO_NOREPLY_NAME` | Matomo noreply name. | `nil` | -| `MATOMO_NOREPLY_ADDRESS` | Matomo noreply address. | `nil` | -| `MATOMO_DATABASE_HOST` | Database server host. | `$MATOMO_DEFAULT_DATABASE_HOST` | -| `MATOMO_DATABASE_PORT_NUMBER` | Database server port. | `3306` | -| `MATOMO_DATABASE_NAME` | Database name. | `bitnami_matomo` | -| `MATOMO_DATABASE_USER` | Database user name. | `bn_matomo` | -| `MATOMO_DATABASE_PASSWORD` | Database user password. | `nil` | -| `MATOMO_DATABASE_TABLE_PREFIX` | Database table prefix. | `matomo_` | +| Name | Description | Default Value | +|----------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------| +| `MATOMO_DATA_TO_PERSIST` | Files to persist relative to the Matomo installation directory. To provide multiple values, separate them with a whitespace. | `$MATOMO_BASE_DIR` | +| `MATOMO_EXCLUDED_DATA_FROM_UPDATE` | Files to exclude from being updated relative to the Matomo installation directory (same as config.ini.php). To provide multiple values, separate them with a whitespace. No defaults. | `nil` | +| `MATOMO_SKIP_BOOTSTRAP` | Whether to perform initial bootstrapping for the application. | `nil` | +| `MATOMO_PROXY_HOST_HEADER` | Specify the host IP HTTP Header. Usually HTTP_X_FORWARDED_HOST. No defaults. | `nil` | +| `MATOMO_PROXY_CLIENT_HEADER` | Specify the client IP HTTP Header. Usually HTTP_X_FORWARDED_FOR. | `nil` | +| `MATOMO_ENABLE_ASSUME_SECURE_PROTOCOL` | Enable assume_secure_protocol in Matomo configuration file. | `no` | +| `MATOMO_ENABLE_FORCE_SSL` | Enable force_ssl in Matomo configuration file. | `no` | +| `MATOMO_ENABLE_PROXY_URI_HEADER` | Enable proxy_uri_header in Matomo configuration file. | `no` | +| `MATOMO_USERNAME` | Matomo user name. | `user` | +| `MATOMO_PASSWORD` | Matomo user password. | `bitnami` | +| `MATOMO_EMAIL` | Matomo user e-mail address. | `user@example.com` | +| `MATOMO_HOST` | Name of a website to track in Matomo. | `127.0.0.1` | +| `MATOMO_WEBSITE_NAME` | Name of a website to track in Matomo. | `example` | +| `MATOMO_WEBSITE_HOST` | Website host or domain to track in Matomo. | `https://example.org` | +| `MATOMO_ENABLE_TRUSTED_HOST_CHECK` | Enable trusted host check. | `no` | +| `MATOMO_ENABLE_DATABASE_SSL` | Whether to enable SSL for database connections in the Matomo configuration file. | `no` | +| `MATOMO_DATABASE_SSL_CA_FILE` | Path to the database server CA bundle file. | `nil` | +| `MATOMO_DATABASE_SSL_CERT_FILE` | Path to the database client certificate file. | `nil` | +| `MATOMO_DATABASE_SSL_KEY_FILE` | Path to the database client certificate key | `nil` | +| `MATOMO_VERIFY_DATABASE_SSL` | Whether to verify the database SSL certificate when SSL is enabled | `yes` | +| `MATOMO_SMTP_HOST` | Matomo SMTP server host. | `nil` | +| `MATOMO_SMTP_PORT_NUMBER` | Matomo SMTP server port number. | `nil` | +| `MATOMO_SMTP_USER` | Matomo SMTP server user. | `nil` | +| `MATOMO_SMTP_PASSWORD` | Matomo SMTP server user password. | `nil` | +| `MATOMO_SMTP_AUTH` | Matomo SMTP server auth type | `nil` | +| `MATOMO_SMTP_PROTOCOL` | Matomo SMTP server protocol to use. | `nil` | +| `MATOMO_NOREPLY_NAME` | Matomo noreply name. | `nil` | +| `MATOMO_NOREPLY_ADDRESS` | Matomo noreply address. | `nil` | +| `MATOMO_DATABASE_HOST` | Database server host. | `$MATOMO_DEFAULT_DATABASE_HOST` | +| `MATOMO_DATABASE_PORT_NUMBER` | Database server port. | `3306` | +| `MATOMO_DATABASE_NAME` | Database name. | `bitnami_matomo` | +| `MATOMO_DATABASE_USER` | Database user name. | `bn_matomo` | +| `MATOMO_DATABASE_PASSWORD` | Database user password. | `nil` | +| `MATOMO_DATABASE_TABLE_PREFIX` | Database table prefix. | `matomo_` | #### Read-only environment variables