From 9e41f358084ec1cbe43c2712ad9fb2786779c727 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 7 Dec 2023 14:15:49 +0100 Subject: [PATCH] [bitnami/magento] Release 2.4.6-debian-11-r117 (#53566) Signed-off-by: Bitnami Containers --- bitnami/magento/2/debian-11/Dockerfile | 28 +++++++++---------- .../opt/bitnami/.bitnami_components.json | 12 ++++---- .../opt/bitnami/scripts/libbitnami.sh | 10 +++---- .../debian-11/prebuildfs/usr/sbin/run-script | 2 +- .../opt/bitnami/scripts/apache/postunpack.sh | 1 + bitnami/magento/README.md | 4 +-- 6 files changed, 29 insertions(+), 28 deletions(-) diff --git a/bitnami/magento/2/debian-11/Dockerfile b/bitnami/magento/2/debian-11/Dockerfile index 2386e0b785c7..d4d99037699e 100644 --- a/bitnami/magento/2/debian-11/Dockerfile +++ b/bitnami/magento/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:08:20Z" \ + org.opencontainers.image.created="2023-12-02T07:33:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.4.6-debian-11-r114" \ + org.opencontainers.image.ref.name="2.4.6-debian-11-r117" \ org.opencontainers.image.title="magento" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.4.6" @@ -20,26 +20,26 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 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 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.11-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.6.15-1-linux-${OS_ARCH}-debian-11" \ - "libphp-8.2.11-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "php-8.2.13-6-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.6.16-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.2.13-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ "magento-2.4.6-8-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d7cb4cb2000f..2beae5543bf1 100644 --- a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,13 +3,13 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-1" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-0" + "version": "8.2.13-0" }, "magento": { "arch": "amd64", @@ -21,24 +21,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.6.15-1" + "version": "10.6.16-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-3" + "version": "8.2.13-6" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e2..3853c789b2ea 100644 --- a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + 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 "" } diff --git a/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277e..b7a5bf1e50bf 100755 --- a/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed..6a480ad4ddde 100755 --- a/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/magento/README.md b/bitnami/magento/README.md index 0a64bcba7853..c6b0dfd47e25 100644 --- a/bitnami/magento/README.md +++ b/bitnami/magento/README.md @@ -1,4 +1,4 @@ -# Magento packaged by Bitnami +# Bitnami package for Magento ## What is Magento? @@ -21,7 +21,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available.