[bitnami/drupal-nginx] Release 10.0.3-debian-11-r5 (#24296)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
2023-02-17 17:26:40 +01:00 · 2023-02-17 17:26:40 +01:00 · d3534e03f2
parent 54d4b91e66
commit d3534e03f2
5 changed files with 39 additions and 38 deletions
--- a/bitnami/drupal-nginx/10/debian-11/Dockerfile
+++ b/bitnami/drupal-nginx/10/debian-11/Dockerfile
@ -2,11 +2,11 @@ FROM docker.io/bitnami/minideb:bullseye

 ARG TARGETARCH

-LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
-      org.opencontainers.image.description="Application packaged by Bitnami" \
+LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-02-17T15:37:51Z" \
+      org.opencontainers.image.description="Application packaged by VMware, Inc" \
      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.0.3-debian-11-r4" \
-      org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/drupal-nginx" \
+      org.opencontainers.image.ref.name="10.0.3-debian-11-r5" \
      org.opencontainers.image.title="drupal-nginx" \
      org.opencontainers.image.vendor="VMware, Inc." \
      org.opencontainers.image.version="10.0.3"
@ -22,12 +22,12 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgeoip1 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 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 unzip zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
    COMPONENTS=( \
-      "php-8.1.15-2-linux-${OS_ARCH}-debian-11" \
-      "nginx-1.23.3-1-linux-${OS_ARCH}-debian-11" \
-      "mysql-client-10.6.12-0-linux-${OS_ARCH}-debian-11" \
-      "render-template-1.0.5-0-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \
-      "drupal-10.0.3-0-linux-${OS_ARCH}-debian-11" \
+      "php-8.1.16-1-linux-${OS_ARCH}-debian-11" \
+      "nginx-1.23.3-2-linux-${OS_ARCH}-debian-11" \
+      "mysql-client-10.6.12-1-linux-${OS_ARCH}-debian-11" \
+      "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
+      "drupal-10.0.3-1-linux-${OS_ARCH}-debian-11" \
    ) && \
    for COMPONENT in "${COMPONENTS[@]}"; do \
      if [ ! -f "${COMPONENT}.tar.gz" ]; then \
--- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@ -1,44 +1,44 @@
 {
    "drupal": {
        "arch": "amd64",
-        "digest": "5e518763eaf4d2b219883ca66d74e577c40c2e93295533738a6db77c26a063ea",
+        "digest": "24582adb937eea81d72a158fb2a9bb4f4782a450d2f754d1ed070a73a0b3b1e2",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "10.0.3-0"
+        "version": "10.0.3-1"
    },
    "gosu": {
        "arch": "amd64",
-        "digest": "9ab9654690d90d3c49ff66fb1eb286487e318adc899d036bc45922f6b176865b",
+        "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "1.16.0-1"
+        "version": "1.16.0-2"
    },
    "mysql-client": {
        "arch": "amd64",
-        "digest": "f1d55c82fe67003513561ab0b4c91f2e7699d4eaaa5d417dc4ed6be50cb4cbed",
+        "digest": "dbc087bd90a6387956751464da45660229b3e7349b96099805e61dcbc2514853",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "10.6.12-0"
+        "version": "10.6.12-1"
    },
    "nginx": {
        "arch": "amd64",
-        "digest": "bb184b4a6fa54bc7bf3fb5d2a861b8219c8769c7b21076fdfe9c74a641b0aa9b",
+        "digest": "f9ec9c59605b25cc206cf6404764e106ecd0159e49a922e41175b95993c83506",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "1.23.3-1"
+        "version": "1.23.3-2"
    },
    "php": {
        "arch": "amd64",
-        "digest": "3b929f9b41ee8fc4bb120b1380d70cc2a2f37e65b02958d3d86436b75e729858",
+        "digest": "928131776dab0ecb6d22ccc2b0b5f790fa6886419b60f9b4beb489f70dc76342",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "8.1.15-2"
+        "version": "8.1.16-1"
    },
    "render-template": {
        "arch": "amd64",
-        "digest": "57c1d857acbb187fcb98f4ba26d138af9d866f59ad38dd443a75c0a6422de994",
+        "digest": "185e277977366ec222d2bde1a395ffa138ce1a9d3bdf1df20c3e49e8b8f9c68b",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "1.0.5-0"
+        "version": "1.0.5-1"
    }
 }
--- a/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh
+++ b/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh
@ -196,7 +196,7 @@ nginx_initialize() {
        nginx_configure_port "$NGINX_HTTP_PORT_NUMBER"
    fi
    # Configure HTTPS port number
-    if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]]; then
+    if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]]; then
        nginx_configure_port "$NGINX_HTTPS_PORT_NUMBER" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"
    fi
    nginx_configure "absolute_redirect" "$(is_boolean_yes "$NGINX_ENABLE_ABSOLUTE_REDIRECT" && echo "on" || echo "off" )"
--- a/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
+++ b/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
@ -31,7 +31,7 @@ nginx_custom_init_scripts
 ! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)"

 # Configure HTTPS port number
-if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] || is_dir_empty "${NGINX_SERVER_BLOCKS_DIR}"; then
+if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] && is_file_writable "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"; then
    cp "${BITNAMI_ROOT_DIR}/scripts/nginx/server_blocks/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"
 fi

--- a/bitnami/drupal-nginx/README.md
+++ b/bitnami/drupal-nginx/README.md
@ -88,8 +88,8 @@ If you want to run the application manually instead of using docker-compose, the
 ##### 2. Create a volume for MariaDB persistence and create a MariaDB container

  ```console
-  docker volume create --name mariadb_data
-  docker run -d --name mariadb \
+ docker volume create --name mariadb_data
+ docker run -d --name mariadb \
    -e ALLOW_EMPTY_PASSWORD=yes \
    -e MARIADB_USER=bn_drupal \
    -e MARIADB_DATABASE=bitnami_drupal \
@ -101,8 +101,8 @@ If you want to run the application manually instead of using docker-compose, the
 ##### 3. Create volumes for Drupal persistence and launch the container

  ```console
-  docker volume create --name drupal_data
-  docker run -d --name drupal -p 8080:8080 -p 8443:8443 \
+ docker volume create --name drupal_data
+ docker run -d --name drupal -p 8080:8080 -p 8443:8443 \
    -e ALLOW_EMPTY_PASSWORD=yes \
    -e DRUPAL_DATABASE_USER=bn_drupal \
    -e DRUPAL_DATABASE_NAME=bitnami_drupal \
@ -184,9 +184,9 @@ docker run -d --name drupal \
  bitnami/drupal-nginx:latest
 ```

-### Configuration
+## Configuration

-#### Environment variables
+### Environment variables

 When you start the Drupal 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:

@ -212,7 +212,7 @@ drupal:

 Available environment variables:

-##### User and Site configuration
+#### User and Site configuration

 * `DRUPAL_PROFILE`: Drupal installation profile. Default: **standard**
 * `DRUPAL_SITE_NAME`: Drupal blog name. Default: **My blog**
@ -224,7 +224,7 @@ Available environment variables:
 * `DRUPAL_CONFIG_SYNC_DIR`: Drupal sync configuration directory location. Only used when `DRUPAL_SKIP_BOOTSTRAP` is enabled. No defaults.
 * `DRUPAL_HASH_SALT`: Drupal string used to generate random values. Only used when `DRUPAL_SKIP_BOOTSTRAP` is enabled. No defaults.

-##### Use an existing database
+#### Use an existing database

 * `DRUPAL_DATABASE_HOST`: Hostname for MariaDB server. Default: **mariadb**
 * `DRUPAL_DATABASE_PORT_NUMBER`: Port used by MariaDB server. Default: **3306**
@ -234,7 +234,7 @@ Available environment variables:
 * `DRUPAL_DATABASE_TLS_CA_FILE`: TLS CA certificate for connections. No defaults.
 * `ALLOW_EMPTY_PASSWORD`: It can be used to allow blank passwords. Default: **no**

-##### Create a database for Drupal using mysql-client
+#### Create a database for Drupal using mysql-client

 * `MYSQL_CLIENT_FLAVOR`: SQL database flavor. Valid values: `mariadb` or `mysql`. Default: **mariadb**.
 * `MYSQL_CLIENT_DATABASE_HOST`: Hostname for MariaDB server. Default: **mariadb**
@ -254,7 +254,7 @@ Available environment variables:
 * `MYSQL_CLIENT_SSL_KEY_FILE`: Path to the SSL CA file for the new database. No defaults
 * `ALLOW_EMPTY_PASSWORD`: It can be used to allow blank passwords. Default: **no**

-##### SMTP Configuration
+#### SMTP Configuration

 To configure Drupal to send email using SMTP you can set the following environment variables:

@ -264,7 +264,7 @@ To configure Drupal to send email using SMTP you can set the following environme
 * `DRUPAL_SMTP_PASSWORD`: SMTP account password.
 * `DRUPAL_SMTP_PROTOCOL`: SMTP protocol. (standard, tls, ssl).

-##### PHP configuration
+#### PHP configuration

 * `PHP_ENABLE_OPCACHE`: Enable OPcache for PHP scripts. No default.
 * `PHP_EXPOSE_PHP`: Enables HTTP header with PHP version. No default.
@ -275,7 +275,7 @@ To configure Drupal to send email using SMTP you can set the following environme
 * `PHP_POST_MAX_SIZE`: Maximum size for PHP POST requests. No default.
 * `PHP_UPLOAD_MAX_FILESIZE`: Maximum file size for PHP uploads. No default.

-###### Example
+#### Example

 This would be an example of SMTP configuration using a Gmail account:

@ -310,6 +310,7 @@ This would be an example of SMTP configuration using a Gmail account:
    --network drupal-tier \
    --volume /path/to/drupal-persistence:/bitnami \
    bitnami/drupal-nginx:latest
+
  ```

 ### Logging
@ -362,7 +363,7 @@ Restoring a backup is as simple as mounting the backup as volumes in the contain
 For the MariaDB database container:

 ```diff
- docker run -d --name mariadb \
+ $ docker run -d --name mariadb \
   ...
 -  --volume /path/to/mariadb-persistence:/bitnami/mariadb \
 +  --volume /path/to/mariadb-backups/latest:/bitnami/mariadb \
@ -372,7 +373,7 @@ For the MariaDB database container:
 For the Drupal container:

 ```diff
- docker run -d --name drupal \
+ $ docker run -d --name drupal \
   ...
 -  --volume /path/to/drupal-persistence:/bitnami/drupal \
 +  --volume /path/to/drupal-backups/latest:/bitnami/drupal \