From 3150c6248396d568a886e7642b07efcd33cf3148 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 8 Mar 2024 02:32:29 +0100 Subject: [PATCH] [bitnami/matomo] Release 5.0.3-debian-12-r0 (#63719) Signed-off-by: Bitnami Containers --- bitnami/matomo/5/debian-12/Dockerfile | 14 +++++++------- .../opt/bitnami/.bitnami_components.json | 6 +++--- .../rootfs/opt/bitnami/scripts/apache-env.sh | 1 + .../opt/bitnami/scripts/apache/entrypoint.sh | 6 ++++++ .../opt/bitnami/scripts/apache/postunpack.sh | 6 +++++- .../rootfs/opt/bitnami/scripts/apache/setup.sh | 7 +++++++ .../debian-12/rootfs/opt/bitnami/scripts/libphp.sh | 5 +++++ .../rootfs/opt/bitnami/scripts/php-env.sh | 1 + .../rootfs/opt/bitnami/scripts/php/postunpack.sh | 6 +++++- bitnami/matomo/5/debian-12/tags-info.yaml | 2 +- 10 files changed, 41 insertions(+), 13 deletions(-) diff --git a/bitnami/matomo/5/debian-12/Dockerfile b/bitnami/matomo/5/debian-12/Dockerfile index 1144ad7ddfde..8d66dfaff8c3 100644 --- a/bitnami/matomo/5/debian-12/Dockerfile +++ b/bitnami/matomo/5/debian-12/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-02-24T00:53:41Z" \ + org.opencontainers.image.created="2024-03-08T00:52:23Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.0.2-debian-12-r5" \ + org.opencontainers.image.ref.name="5.0.3-debian-12-r0" \ org.opencontainers.image.title="matomo" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.0.2" + org.opencontainers.image.version="5.0.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -26,13 +26,13 @@ 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.6-9-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.6-10-linux-${OS_ARCH}-debian-12" \ "php-8.2.16-2-linux-${OS_ARCH}-debian-12" \ "apache-2.4.58-7-linux-${OS_ARCH}-debian-12" \ "mysql-client-10.11.7-1-linux-${OS_ARCH}-debian-12" \ "libphp-8.2.16-1-linux-${OS_ARCH}-debian-12" \ - "ini-file-1.4.6-9-linux-${OS_ARCH}-debian-12" \ - "matomo-5.0.2-1-linux-${OS_ARCH}-debian-12" \ + "ini-file-1.4.6-10-linux-${OS_ARCH}-debian-12" \ + "matomo-5.0.3-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -57,7 +57,7 @@ RUN /opt/bitnami/scripts/matomo/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="5.0.2" \ + APP_VERSION="5.0.3" \ BITNAMI_APP_NAME="matomo" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:$PATH" 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 7f299fc61e8f..5977f8cdab72 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.6-9" + "version": "1.4.6-10" }, "libphp": { "arch": "amd64", @@ -21,7 +21,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "5.0.2-1" + "version": "5.0.3-0" }, "mysql-client": { "arch": "amd64", @@ -39,6 +39,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.6-9" + "version": "1.0.6-10" } } \ No newline at end of file diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache-env.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache-env.sh index 449481062e54..a0c905a9bdcb 100644 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache-env.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache-env.sh @@ -48,6 +48,7 @@ export WEB_SERVER_TYPE="apache" export APACHE_BASE_DIR="${BITNAMI_ROOT_DIR}/apache" export APACHE_BIN_DIR="${APACHE_BASE_DIR}/bin" export APACHE_CONF_DIR="${APACHE_BASE_DIR}/conf" +export APACHE_DEFAULT_CONF_DIR="${APACHE_BASE_DIR}/conf.default" export APACHE_HTDOCS_DIR="${APACHE_BASE_DIR}/htdocs" export APACHE_TMP_DIR="${APACHE_BASE_DIR}/var/run" export APACHE_LOGS_DIR="${APACHE_BASE_DIR}/logs" diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/entrypoint.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/entrypoint.sh index dad82feba389..ea643ca0914f 100755 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/entrypoint.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/entrypoint.sh @@ -19,6 +19,12 @@ set -o pipefail print_welcome_page +# We add the copy from default config in the entrypoint to not break users +# bypassing the setup.sh logic. If the file already exists do not overwrite (in +# case someone mounts a configuration file in /opt/bitnami/apache/conf) +debug "Copying files from $APACHE_DEFAULT_CONF_DIR to $APACHE_CONF_DIR" +cp -nr "$APACHE_DEFAULT_CONF_DIR"/. "$APACHE_CONF_DIR" + if [[ "$*" == *"/opt/bitnami/scripts/apache/run.sh"* ]]; then info "** Starting Apache setup **" /opt/bitnami/scripts/apache/setup.sh diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 6a480ad4ddde..3ea96864d6c0 100755 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -109,7 +109,7 @@ EOF apache_setup_bitnami_config # Ensure non-root user has write permissions on a set of directories -for dir in "$APACHE_TMP_DIR" "$APACHE_CONF_DIR" "$APACHE_LOGS_DIR" "$APACHE_VHOSTS_DIR" "$APACHE_HTACCESS_DIR" "$APACHE_HTDOCS_DIR"; do +for dir in "$APACHE_TMP_DIR" "$APACHE_CONF_DIR" "$APACHE_LOGS_DIR" "$APACHE_VHOSTS_DIR" "$APACHE_HTACCESS_DIR" "$APACHE_HTDOCS_DIR" "$APACHE_DEFAULT_CONF_DIR"; do ensure_dir_exists "$dir" chmod -R g+rwX "$dir" done @@ -125,3 +125,7 @@ ln -sf "/dev/stderr" "${APACHE_LOGS_DIR}/error_log" # Source: https://stackoverflow.com/questions/94445/using-openssl-what-does-unable-to-write-random-state-mean touch /.rnd && chmod g+rw /.rnd + +# Copy all initially generated configuration files to the default directory +# (this is to avoid breaking when entrypoint is being overridden) +cp -r "$APACHE_CONF_DIR"/* "$APACHE_DEFAULT_CONF_DIR" diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh index ab451b6c1442..9c758d084f95 100755 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh @@ -10,6 +10,7 @@ set -o pipefail # set -o xtrace # Uncomment this line for debugging purposes # Load libraries +. /opt/bitnami/scripts/libfs.sh . /opt/bitnami/scripts/liblog.sh . /opt/bitnami/scripts/libapache.sh @@ -22,6 +23,12 @@ apache_validate # Ensure Apache daemon user exists when running as 'root' am_i_root && ensure_user_exists "$APACHE_DAEMON_USER" --group "$APACHE_DAEMON_GROUP" +if ! is_dir_empty "$APACHE_DEFAULT_CONF_DIR"; then + # We add the copy from default config in the initialize function for web applications + # that make use of the Apache setup.sh script + debug "Copying files from $APACHE_DEFAULT_CONF_DIR to $APACHE_CONF_DIR" + cp -nr "$APACHE_DEFAULT_CONF_DIR"/. "$APACHE_CONF_DIR" +fi # Generate SSL certs (without a passphrase) ensure_dir_exists "${APACHE_CONF_DIR}/bitnami/certs" if [[ ! -f "${APACHE_CONF_DIR}/bitnami/certs/server.crt" ]]; then diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libphp.sh index a107519847f5..369f5ae6b334 100644 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libphp.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/libphp.sh @@ -59,8 +59,13 @@ php_conf_set() { php_initialize() { # Configure PHP options based on the runtime environment info "Configuring PHP options" + if ! is_dir_empty "$PHP_DEFAULT_CONF_DIR"; then + # Copy default configuration to php configuration directory + cp -nr "$PHP_DEFAULT_CONF_DIR"/. "$PHP_CONF_DIR" + fi php_set_runtime_config "$PHP_CONF_FILE" + # PHP-FPM configuration ! is_empty_value "$PHP_FPM_LISTEN_ADDRESS" && info "Setting PHP-FPM listen option" && php_conf_set "listen" "$PHP_FPM_LISTEN_ADDRESS" "${PHP_CONF_DIR}/php-fpm.d/www.conf" diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/php-env.sh index 97043106ecb5..669690619be6 100644 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/php-env.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/php-env.sh @@ -52,6 +52,7 @@ unset php_env_vars export PHP_BASE_DIR="${BITNAMI_ROOT_DIR}/php" export PHP_BIN_DIR="${PHP_BASE_DIR}/bin" export PHP_CONF_DIR="${PHP_BASE_DIR}/etc" +export PHP_DEFAULT_CONF_DIR="${PHP_BASE_DIR}/etc.default" export PHP_TMP_DIR="${PHP_BASE_DIR}/var/run" export PHP_CONF_FILE="${PHP_CONF_DIR}/php.ini" diff --git a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/php/postunpack.sh b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/php/postunpack.sh index 9a8b9fe2bcd9..762772bf9e10 100755 --- a/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/php/postunpack.sh +++ b/bitnami/matomo/5/debian-12/rootfs/opt/bitnami/scripts/php/postunpack.sh @@ -29,7 +29,7 @@ php_conf_set "upload_tmp_dir" "${PHP_BASE_DIR}/tmp" php_conf_set "session.save_path" "${PHP_TMP_DIR}/session" # Ensure directories used by PHP-FPM exist and have proper ownership and permissions -for dir in "$PHP_CONF_DIR" "${PHP_BASE_DIR}/tmp" "$PHP_TMP_DIR" "$PHP_FPM_LOGS_DIR" "${PHP_TMP_DIR}/session"; do +for dir in "$PHP_CONF_DIR" "$PHP_DEFAULT_CONF_DIR" "${PHP_BASE_DIR}/tmp" "$PHP_TMP_DIR" "$PHP_FPM_LOGS_DIR" "${PHP_TMP_DIR}/session"; do ensure_dir_exists "$dir" chmod -R g+rwX "$dir" done @@ -41,3 +41,7 @@ touch "${PHP_CONF_DIR}/common.conf" # Log to stdout/stderr for easy debugging ln -sf "/dev/stdout" "$PHP_FPM_LOG_FILE" php_conf_set "error_log" "/dev/stderr" + +# Copy all initially generated configuration files to the default directory +# (this is to avoid breaking when entrypoint is being overridden) +cp -r "$PHP_CONF_DIR"/* "$PHP_DEFAULT_CONF_DIR" diff --git a/bitnami/matomo/5/debian-12/tags-info.yaml b/bitnami/matomo/5/debian-12/tags-info.yaml index 89228116d64c..693f25fa73e8 100644 --- a/bitnami/matomo/5/debian-12/tags-info.yaml +++ b/bitnami/matomo/5/debian-12/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "5" - 5-debian-12 -- 5.0.2 +- 5.0.3 - latest