From d0168992d0c7122d365c86d3f056fb44484b16bf Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 16 Mar 2023 20:24:06 +0100 Subject: [PATCH] [bitnami/magento] Release 2.4.6-debian-11-r0 (#27517) Signed-off-by: Bitnami Containers --- bitnami/magento/2/debian-11/Dockerfile | 14 +++++++------- .../opt/bitnami/.bitnami_components.json | 12 ++++++------ .../rootfs/opt/bitnami/scripts/libmagento.sh | 1 + .../rootfs/opt/bitnami/scripts/libmysqlclient.sh | 5 +++++ bitnami/magento/2/debian-11/tags-info.yaml | 2 +- bitnami/magento/README.md | 1 - 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/bitnami/magento/2/debian-11/Dockerfile b/bitnami/magento/2/debian-11/Dockerfile index 61d782d28f84..ae08145e022b 100644 --- a/bitnami/magento/2/debian-11/Dockerfile +++ b/bitnami/magento/2/debian-11/Dockerfile @@ -3,13 +3,13 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-14T05:24:59Z" \ + org.opencontainers.image.created="2023-03-16T17:57:17Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.4.5-p1-debian-11-r51" \ + org.opencontainers.image.ref.name="2.4.6-debian-11-r0" \ org.opencontainers.image.title="magento" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.4.5-p1" + org.opencontainers.image.version="2.4.6" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,13 +22,13 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] 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 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "php-8.1.16-2-linux-${OS_ARCH}-debian-11" \ + "php-8.1.17-0-linux-${OS_ARCH}-debian-11" \ "apache-2.4.56-0-linux-${OS_ARCH}-debian-11" \ "wait-for-port-1.0.6-1-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.6.12-1-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.16-3-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.17-0-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \ - "magento-2.4.5-p1-16-linux-${OS_ARCH}-debian-11" \ + "magento-2.4.6-0-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -54,7 +54,7 @@ RUN /opt/bitnami/scripts/magento/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="2.4.5-p1" \ + APP_VERSION="2.4.6" \ BITNAMI_APP_NAME="magento" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/common/bin:/opt/bitnami/mysql/bin:/opt/bitnami/magento/bin:$PATH" 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 72525666ff63..7557dba82ac9 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 @@ -15,17 +15,17 @@ }, "libphp": { "arch": "amd64", - "digest": "6556a2340a5156847b4526d9da53c875d2a95760d0681bdcff814a2686f71842", + "digest": "82efbf417c732cc40168ef2c6d204b9737c1470a75016b575039aab1348241b9", "distro": "debian-11", "type": "NAMI", - "version": "8.1.16-3" + "version": "8.1.17-0" }, "magento": { "arch": "amd64", - "digest": "aa84997b0a4f88fd3fe04624451c3775ae0c83af69dd5767a83049c7dfc04da8", + "digest": "a7556498e0cefa04bfb2cf4bc7018c11e10d90783ec0a3df8549bfc0e06dbdb9", "distro": "debian-11", "type": "NAMI", - "version": "2.4.5-p1-16" + "version": "2.4.6-0" }, "mysql-client": { "arch": "amd64", @@ -36,10 +36,10 @@ }, "php": { "arch": "amd64", - "digest": "a10f96a58910715edded557f5e8f59be11b73132257b024cab6ddc864eac186e", + "digest": "6b1ce5c0f853008554f356d4721625cb7dc41fb932339ff86db04dfb874598a4", "distro": "debian-11", "type": "NAMI", - "version": "8.1.16-2" + "version": "8.1.17-0" }, "render-template": { "arch": "amd64", diff --git a/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/libmagento.sh b/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/libmagento.sh index 1c9797d05df1..c2207a993ab7 100644 --- a/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/libmagento.sh +++ b/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/libmagento.sh @@ -284,6 +284,7 @@ magento_initialize() { # Setup would be hard as it would require to configure Sendmail (SMTP not supported) and authorization keys # 'You need to configure Two-Factor Authorization in order to proceed to your store's admin area' # 'An E-mail was sent to you with further instructions' + magento_execute module:disable "Magento_AdminAdobeImsTwoFactorAuth" magento_execute module:disable "Magento_TwoFactorAuth" # Set the Magento mode in 'env.php' diff --git a/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh index 56ce1b553f7b..c6b4edbcf1eb 100644 --- a/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -446,6 +446,11 @@ mysql_stop() { mysql_install_db() { local command="${DB_BIN_DIR}/mysql_install_db" local -a args=("--defaults-file=${DB_CONF_FILE}" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}") + + # Add flags specified via the 'DB_EXTRA_FLAGS' environment variable + read -r -a db_extra_flags <<< "$(mysql_extra_flags)" + [[ "${#db_extra_flags[@]}" -gt 0 ]] && args+=("${db_extra_flags[@]}") + am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER") if [[ "$DB_FLAVOR" = "mariadb" ]]; then args+=("--auth-root-authentication-method=normal") diff --git a/bitnami/magento/2/debian-11/tags-info.yaml b/bitnami/magento/2/debian-11/tags-info.yaml index 5e4fd702eebe..ef79ef91b5e7 100644 --- a/bitnami/magento/2/debian-11/tags-info.yaml +++ b/bitnami/magento/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.4.5-p1 +- 2.4.6 - latest diff --git a/bitnami/magento/README.md b/bitnami/magento/README.md index f5ff4a72e06e..d041d79e27d3 100644 --- a/bitnami/magento/README.md +++ b/bitnami/magento/README.md @@ -5,7 +5,6 @@ > Magento is a powerful open source e-commerce platform. With easy customizations and rich features, it allows retailers to grow their online businesses in a cost-effective way. [Overview of Magento](http://www.magento.com) - Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. ## TL;DR