From 37420d3276e27f9c9ec327c4d5d8d39dedbf2caf Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sun, 31 Mar 2024 21:20:26 +0200 Subject: [PATCH] [bitnami/magento] Release 2.4.6-debian-12-r23 (#64432) Signed-off-by: Bitnami Containers --- bitnami/magento/2/debian-12/Dockerfile | 14 ++-- .../opt/bitnami/.bitnami_components.json | 10 +-- .../opt/bitnami/scripts/libbitnami.sh | 1 + .../opt/bitnami/apache/conf/deflate.conf | 2 +- .../scripts/apache-modphp/postunpack.sh | 4 + bitnami/magento/README.md | 76 ++++++++++--------- 6 files changed, 60 insertions(+), 47 deletions(-) diff --git a/bitnami/magento/2/debian-12/Dockerfile b/bitnami/magento/2/debian-12/Dockerfile index 9236b1f95732..c44388d20dc5 100644 --- a/bitnami/magento/2/debian-12/Dockerfile +++ b/bitnami/magento/2/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-03-05T10:27:37Z" \ + org.opencontainers.image.created="2024-03-31T17:38:43Z" \ 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-12-r22" \ + org.opencontainers.image.ref.name="2.4.6-debian-12-r23" \ org.opencontainers.image.title="magento" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.4.6" @@ -25,12 +25,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 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 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" \ - "php-8.2.16-2-linux-${OS_ARCH}-debian-12" \ - "apache-2.4.58-7-linux-${OS_ARCH}-debian-12" \ - "wait-for-port-1.0.7-9-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.6-10-linux-${OS_ARCH}-debian-12" \ + "php-8.2.17-1-linux-${OS_ARCH}-debian-12" \ + "apache-2.4.58-8-linux-${OS_ARCH}-debian-12" \ + "wait-for-port-1.0.7-10-linux-${OS_ARCH}-debian-12" \ "mysql-client-10.6.17-1-linux-${OS_ARCH}-debian-12" \ - "libphp-8.2.16-1-linux-${OS_ARCH}-debian-12" \ + "libphp-8.2.17-0-linux-${OS_ARCH}-debian-12" \ "magento-2.4.6-11-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/magento/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/magento/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 009cd7b867f2..d817a8791db3 100644 --- a/bitnami/magento/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/magento/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,13 +3,13 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "2.4.58-7" + "version": "2.4.58-8" }, "libphp": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "8.2.16-1" + "version": "8.2.17-0" }, "magento": { "arch": "amd64", @@ -27,18 +27,18 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "8.2.16-2" + "version": "8.2.17-1" }, "render-template": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.6-9" + "version": "1.0.6-10" }, "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/magento/2/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/magento/2/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 3853c789b2ea..aa782fc6a4db 100644 --- a/bitnami/magento/2/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/magento/2/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/magento/2/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf b/bitnami/magento/2/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf index ca9bc1d6e4b6..6016f8fbe582 100644 --- a/bitnami/magento/2/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf +++ b/bitnami/magento/2/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf @@ -1,5 +1,5 @@ - AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css + AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript AddOutputFilterByType DEFLATE application/rss+xml diff --git a/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh b/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh index a415969338cc..3f0c344de235 100755 --- a/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh +++ b/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh @@ -37,3 +37,7 @@ AddType application/x-httpd-php .php DirectoryIndex index.html index.htm index.php EOF ensure_apache_configuration_exists "Include \"${apache_php_conf_file}\"" + +# 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/magento/README.md b/bitnami/magento/README.md index 2c37e07196a7..260dfded1b38 100644 --- a/bitnami/magento/README.md +++ b/bitnami/magento/README.md @@ -228,39 +228,48 @@ When the container is executed for the first time, it will execute the files wit #### Customizable environment variables -| Name | Description | Default Value | -|--------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|---------------------| -| `MAGENTO_DATA_TO_PERSIST` | Files to persist relative to the Magento installation directory. To provide multiple values, separate them with a whitespace. | `$MAGENTO_BASE_DIR` | -| `MAGENTO_HOST` | Magento host domain or IP address. | `localhost` | -| `MAGENTO_ENABLE_HTTPS` | Whether to enable SSL to access the Magento store. | `no` | -| `MAGENTO_ENABLE_ADMIN_HTTPS` | Whether to use SSL to access the Magento administration panel. | `no` | -| `MAGENTO_EXTERNAL_HTTP_PORT_NUMBER` | Port to access Magento from outside of the instance using HTTP. | `80` | -| `MAGENTO_EXTERNAL_HTTPS_PORT_NUMBER` | Port to access Magento from outside of the instance using HTTPS. | `443` | -| `MAGENTO_FIRST_NAME` | Magento user first name. | `FirstName` | -| `MAGENTO_LAST_NAME` | Magento user last name. | `LastName` | -| `MAGENTO_MODE` | Magento mode. | `default` | -| `MAGENTO_ADMIN_URL_PREFIX` | URL prefix to access the Magento administration panel. | `admin` | -| `MAGENTO_DEPLOY_STATIC_CONTENT` | Whether to deploy Magento static content during the initialization, to optimize initial page load time. | `no` | -| `MAGENTO_KEEP_STATIC` | Whether to keep the content of 'pub/static' folder during the initialization. | `no` | -| `MAGENTO_SKIP_REINDEX` | Whether to skip Magento re-index during the initialization. | `no` | -| `MAGENTO_SKIP_BOOTSTRAP` | Whether to perform initial bootstrapping for the application. | `no` | -| `MAGENTO_USERNAME` | Magento user login name. | `user` | -| `MAGENTO_PASSWORD` | Magento user password. | `bitnami1` | -| `MAGENTO_EMAIL` | Magento user e-mail address. | `user@example.com` | -| `MAGENTO_ENABLE_HTTP_CACHE` | Whether to enable a HTTP cache server for Magento (i.e. Varnish). | `no` | -| `MAGENTO_DATABASE_HOST` | Database server host. | `mariadb` | -| `MAGENTO_DATABASE_HOST` | Database server host. | `127.0.0.1` | -| `MAGENTO_DATABASE_PORT_NUMBER` | Database server port. | `3306` | -| `MAGENTO_DATABASE_NAME` | Database name. | `bitnami_magento` | -| `MAGENTO_DATABASE_USER` | Database user name. | `bn_magento` | -| `MAGENTO_ENABLE_DATABASE_SSL` | Whether to enable SSL for database connections. | `no` | -| `MAGENTO_VERIFY_DATABASE_SSL` | Whether to verify the database SSL certificate when SSL is enabled for database connections. | `yes` | -| `MAGENTO_SEARCH_ENGINE` | Magento search engine to use. | `elasticsearch7` | -| `MAGENTO_ELASTICSEARCH_HOST` | Elasticsearch server host. | `elasticsearch` | -| `MAGENTO_ELASTICSEARCH_HOST` | Elasticsearch server host. | `127.0.0.1` | -| `MAGENTO_ELASTICSEARCH_PORT_NUMBER` | Elasticsearch server port. | `9200` | -| `MAGENTO_ELASTICSEARCH_USE_HTTPS` | Whether to use https to connect with Elasticsearch. | `no` | -| `MAGENTO_ELASTICSEARCH_ENABLE_AUTH` | Whether to enable authentication for connections to the Elasticsearch server. | `no` | +| Name | Description | Default Value | +|------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|---------------------| +| `MAGENTO_DATA_TO_PERSIST` | Files to persist relative to the Magento installation directory. To provide multiple values, separate them with a whitespace. | `$MAGENTO_BASE_DIR` | +| `MAGENTO_HOST` | Magento host domain or IP address. | `localhost` | +| `MAGENTO_ENABLE_HTTPS` | Whether to enable SSL to access the Magento store. | `no` | +| `MAGENTO_ENABLE_ADMIN_HTTPS` | Whether to use SSL to access the Magento administration panel. | `no` | +| `MAGENTO_EXTERNAL_HTTP_PORT_NUMBER` | Port to access Magento from outside of the instance using HTTP. | `80` | +| `MAGENTO_EXTERNAL_HTTPS_PORT_NUMBER` | Port to access Magento from outside of the instance using HTTPS. | `443` | +| `MAGENTO_FIRST_NAME` | Magento user first name. | `FirstName` | +| `MAGENTO_LAST_NAME` | Magento user last name. | `LastName` | +| `MAGENTO_MODE` | Magento mode. | `default` | +| `MAGENTO_EXTRA_INSTALL_ARGS` | Extra flags to append to the Magento 'setup:install' command call. | `nil` | +| `MAGENTO_ADMIN_URL_PREFIX` | URL prefix to access the Magento administration panel. | `admin` | +| `MAGENTO_DEPLOY_STATIC_CONTENT` | Whether to deploy Magento static content during the initialization, to optimize initial page load time. | `no` | +| `MAGENTO_KEEP_STATIC` | Whether to keep the content of 'pub/static' folder during the initialization. | `no` | +| `MAGENTO_SKIP_REINDEX` | Whether to skip Magento re-index during the initialization. | `no` | +| `MAGENTO_SKIP_BOOTSTRAP` | Whether to perform initial bootstrapping for the application. | `no` | +| `MAGENTO_USERNAME` | Magento user login name. | `user` | +| `MAGENTO_PASSWORD` | Magento user password. | `bitnami1` | +| `MAGENTO_EMAIL` | Magento user e-mail address. | `user@example.com` | +| `MAGENTO_ENABLE_HTTP_CACHE` | Whether to enable a HTTP cache server for Magento (i.e. Varnish). | `no` | +| `MAGENTO_HTTP_CACHE_BACKEND_HOST` | HTTP cache backend hostname. | `nil` | +| `MAGENTO_HTTP_CACHE_BACKEND_PORT_NUMBER` | HTTP cache backend port. | `nil` | +| `MAGENTO_HTTP_CACHE_SERVER_HOST` | HTTP cache server hostname. | `nil` | +| `MAGENTO_HTTP_CACHE_SERVER_PORT_NUMBER` | HTTP cache server port. | `nil` | +| `MAGENTO_DATABASE_HOST` | Database server host. | `mariadb` | +| `MAGENTO_DATABASE_PORT_NUMBER` | Database server port. | `3306` | +| `MAGENTO_DATABASE_NAME` | Database name. | `bitnami_magento` | +| `MAGENTO_DATABASE_USER` | Database user name. | `bn_magento` | +| `MAGENTO_DATABASE_PASSWORD` | Database user password. | `nil` | +| `MAGENTO_ENABLE_DATABASE_SSL` | Whether to enable SSL for database connections. | `no` | +| `MAGENTO_VERIFY_DATABASE_SSL` | Whether to verify the database SSL certificate when SSL is enabled for database connections. | `yes` | +| `MAGENTO_DATABASE_SSL_CERT_FILE` | Path to the database client certificate file. | `nil` | +| `MAGENTO_DATABASE_SSL_KEY_FILE` | Path to the database client certificate key file. | `nil` | +| `MAGENTO_DATABASE_SSL_CA_FILE` | Path to the database server CA bundle file. | `nil` | +| `MAGENTO_SEARCH_ENGINE` | Magento search engine to use. | `elasticsearch7` | +| `MAGENTO_ELASTICSEARCH_HOST` | Elasticsearch server host. | `elasticsearch` | +| `MAGENTO_ELASTICSEARCH_PORT_NUMBER` | Elasticsearch server port. | `9200` | +| `MAGENTO_ELASTICSEARCH_USE_HTTPS` | Whether to use https to connect with Elasticsearch. | `no` | +| `MAGENTO_ELASTICSEARCH_ENABLE_AUTH` | Whether to enable authentication for connections to the Elasticsearch server. | `no` | +| `MAGENTO_ELASTICSEARCH_USER` | Elasticsearch server user login. | `nil` | +| `MAGENTO_ELASTICSEARCH_PASSWORD` | Elasticsearch server user password. | `nil` | #### Read-only environment variables @@ -271,7 +280,6 @@ When the container is executed for the first time, it will execute the files wit | `MAGENTO_CONF_FILE` | Configuration file for Magento. | `${MAGENTO_BASE_DIR}/app/etc/env.php` | | `MAGENTO_VOLUME_DIR` | Magento directory for mounted configuration files. | `${BITNAMI_VOLUME_DIR}/magento` | | `PHP_DEFAULT_MAX_EXECUTION_TIME` | Default PHP max execution time. | `18000` | -| `PHP_DEFAULT_MEMORY_LIMIT` | Default PHP memory limit. | `2G` | | `PHP_DEFAULT_MEMORY_LIMIT` | Default PHP memory limit. | `1G` | When you start the Magento image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line. If you want to add a new environment variable: