From 85d84eebdb623a1337480a19bb1e171725767e1d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 25 Mar 2024 03:44:27 +0100 Subject: [PATCH] [bitnami/laravel] Release 10.3.3-debian-12-r6 (#64106) Signed-off-by: Bitnami Containers --- bitnami/laravel/10/debian-12/Dockerfile | 10 +++++----- .../prebuildfs/opt/bitnami/.bitnami_components.json | 6 +++--- .../prebuildfs/opt/bitnami/scripts/libbitnami.sh | 1 + .../10/debian-12/rootfs/opt/bitnami/scripts/libphp.sh | 5 +++++ .../10/debian-12/rootfs/opt/bitnami/scripts/php-env.sh | 1 + .../rootfs/opt/bitnami/scripts/php/postunpack.sh | 6 +++++- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/bitnami/laravel/10/debian-12/Dockerfile b/bitnami/laravel/10/debian-12/Dockerfile index afa30d064639..90e8e1de5a2a 100644 --- a/bitnami/laravel/10/debian-12/Dockerfile +++ b/bitnami/laravel/10/debian-12/Dockerfile @@ -7,10 +7,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="2024-02-24T00:53:44Z" \ + org.opencontainers.image.created="2024-03-25T01:52:51Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.3.3-debian-12-r5" \ + org.opencontainers.image.ref.name="10.3.3-debian-12-r6" \ org.opencontainers.image.title="laravel" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.3.3" @@ -25,9 +25,9 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libbrotli1 libbsd0 libbz2-1.0 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 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncursesw6 libnettle8 libnghttp2-14 libnsl2 libonig5 libp11-kit0 libpcre2-8-0 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl3 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libtirpc3 libunistring2 libwebp7 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 libzstd1 procps sqlite3 sudo zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.8-3-linux-${OS_ARCH}-debian-12" \ - "wait-for-port-1.0.7-9-linux-${OS_ARCH}-debian-12" \ - "php-8.2.16-2-linux-${OS_ARCH}-debian-12" \ + "python-3.11.8-4-linux-${OS_ARCH}-debian-12" \ + "wait-for-port-1.0.7-10-linux-${OS_ARCH}-debian-12" \ + "php-8.2.17-0-linux-${OS_ARCH}-debian-12" \ "node-18.19.1-0-linux-${OS_ARCH}-debian-12" \ "laravel-10.3.3-1-linux-${OS_ARCH}-debian-12" \ ) ; \ diff --git a/bitnami/laravel/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/laravel/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 265df349c175..b0f5bbf6f125 100644 --- a/bitnami/laravel/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/laravel/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,18 +15,18 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "8.2.16-2" + "version": "8.2.17-0" }, "python": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "3.11.8-3" + "version": "3.11.8-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.7-9" + "version": "1.0.7-10" } } \ No newline at end of file diff --git a/bitnami/laravel/10/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/laravel/10/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 3853c789b2ea..aa782fc6a4db 100644 --- a/bitnami/laravel/10/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/laravel/10/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -48,6 +48,7 @@ print_image_welcome_page() { info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "Upgrade to Tanzu Application Catalog for production environments to access custom-configured and pre-packaged software components. Gain enhanced features, including Software Bill of Materials (SBOM), CVE scan result reports, and VEX documents. To learn more, visit ${BOLD}https://bitnami.com/enterprise${RESET}" info "" } diff --git a/bitnami/laravel/10/debian-12/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/laravel/10/debian-12/rootfs/opt/bitnami/scripts/libphp.sh index a107519847f5..369f5ae6b334 100644 --- a/bitnami/laravel/10/debian-12/rootfs/opt/bitnami/scripts/libphp.sh +++ b/bitnami/laravel/10/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/laravel/10/debian-12/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/laravel/10/debian-12/rootfs/opt/bitnami/scripts/php-env.sh index 97043106ecb5..669690619be6 100644 --- a/bitnami/laravel/10/debian-12/rootfs/opt/bitnami/scripts/php-env.sh +++ b/bitnami/laravel/10/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/laravel/10/debian-12/rootfs/opt/bitnami/scripts/php/postunpack.sh b/bitnami/laravel/10/debian-12/rootfs/opt/bitnami/scripts/php/postunpack.sh index 9a8b9fe2bcd9..762772bf9e10 100755 --- a/bitnami/laravel/10/debian-12/rootfs/opt/bitnami/scripts/php/postunpack.sh +++ b/bitnami/laravel/10/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"