From e418b69864ea01456c0f8ef5b56b6bf7c44933a8 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 24 Dec 2021 05:09:05 +0000 Subject: [PATCH] 9.3.0-debian-10-r15 release --- bitnami/drupal-nginx/9/debian-10/Dockerfile | 6 +- .../opt/bitnami/.bitnami_components.json | 4 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 178 +++++++++--------- bitnami/drupal-nginx/README.md | 2 +- 4 files changed, 96 insertions(+), 94 deletions(-) diff --git a/bitnami/drupal-nginx/9/debian-10/Dockerfile b/bitnami/drupal-nginx/9/debian-10/Dockerfile index bfc17dbf8778..7621cc68e1af 100644 --- a/bitnami/drupal-nginx/9/debian-10/Dockerfile +++ b/bitnami/drupal-nginx/9/debian-10/Dockerfile @@ -8,8 +8,8 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages acl ca-certificates curl dirmngr gnupg gzip libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libgeoip1 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 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 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 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 tar unzip zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.27-2" --checksum 00c27d3d0d2dc5db11f1c8d5b0271c3e55d89e81e11e82b4ab9de26bfebf8b21 +RUN install_packages acl ca-certificates curl dirmngr gnupg gzip libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libgeoip1 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 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 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 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 tar unzip zlib1g +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.1.1-2" --checksum 4e5a308fa0e2c831f293dbbacb4793b8b80bbf8c030356d66276b982075762eb RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "nginx" "1.21.4-0" --checksum 9aaf0999079e60bfe7aa79f35499e340140d1ac1c68e164f009226913dae4604 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.32-0" --checksum 4a211faa9436c9747dfc4374cb9e8a7f9b0065dfc58dd4784cef0f5029c2e65e RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-4" --checksum 9b09b8c13e726569fd846abef20228b2e29de456805994e512f3b47f74cf742d @@ -25,7 +25,7 @@ RUN /opt/bitnami/scripts/drupal/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ BITNAMI_APP_NAME="drupal-nginx" \ - BITNAMI_IMAGE_VERSION="9.3.0-debian-10-r14" \ + BITNAMI_IMAGE_VERSION="9.3.0-debian-10-r15" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 41ca4780c5a5..e28852f53149 100644 --- a/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -29,10 +29,10 @@ }, "php": { "arch": "amd64", - "digest": "00c27d3d0d2dc5db11f1c8d5b0271c3e55d89e81e11e82b4ab9de26bfebf8b21", + "digest": "4e5a308fa0e2c831f293dbbacb4793b8b80bbf8c030356d66276b982075762eb", "distro": "debian-10", "type": "NAMI", - "version": "7.4.27-2" + "version": "8.1.1-2" }, "render-template": { "arch": "amd64", diff --git a/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 0a1a92a747f9..b6c50da90807 100644 --- a/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh @@ -7,6 +7,7 @@ # Load Generic Libraries . /opt/bitnami/scripts/liblog.sh . /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libvalidations.sh # Functions @@ -53,17 +54,17 @@ ensure_group_exists() { shift 1 while [ "$#" -gt 0 ]; do case "$1" in - -i|--gid) - shift - gid="${1:?missing gid}" - ;; - -s|--system) - is_system_user=true - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; + -i | --gid) + shift + gid="${1:?missing gid}" + ;; + -s | --system) + is_system_user=true + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; esac shift done @@ -71,7 +72,7 @@ ensure_group_exists() { if ! group_exists "$group"; then local -a args=("$group") if [[ -n "$gid" ]]; then - if group_exists "$gid" ; then + if group_exists "$gid"; then error "The GID $gid is already in use." >&2 return 1 fi @@ -107,29 +108,29 @@ ensure_user_exists() { shift 1 while [ "$#" -gt 0 ]; do case "$1" in - -i|--uid) - shift - uid="${1:?missing uid}" - ;; - -g|--group) - shift - group="${1:?missing group}" - ;; - -a|--append-groups) - shift - append_groups="${1:?missing append_groups}" - ;; - -h|--home) - shift - home="${1:?missing home directory}" - ;; - -s|--system) - is_system_user=true - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; + -i | --uid) + shift + uid="${1:?missing uid}" + ;; + -g | --group) + shift + group="${1:?missing group}" + ;; + -a | --append-groups) + shift + append_groups="${1:?missing append_groups}" + ;; + -h | --home) + shift + home="${1:?missing home directory}" + ;; + -s | --system) + is_system_user=true + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; esac shift done @@ -137,7 +138,7 @@ ensure_user_exists() { if ! user_exists "$user"; then local -a user_args=("-N" "$user") if [[ -n "$uid" ]]; then - if user_exists "$uid" ; then + if user_exists "$uid"; then error "The UID $uid is already in use." return 1 fi @@ -157,7 +158,7 @@ ensure_user_exists() { if [[ -n "$append_groups" ]]; then local -a groups - read -ra groups <<< "$(tr ',;' ' ' <<< "$append_groups")" + read -ra groups <<<"$(tr ',;' ' ' <<<"$append_groups")" for group in "${groups[@]}"; do ensure_group_exists "$group" usermod -aG "$group" "$user" >/dev/null 2>&1 @@ -210,21 +211,22 @@ get_os_metadata() { ) } case "$flag_name" in - --id) - get_os_release_metadata ID - ;; - --version) - get_os_release_metadata VERSION_ID - ;; - --branch) - get_os_release_metadata VERSION_ID | sed 's/\..*//' - ;; - --codename) - get_os_release_metadata VERSION_CODENAME - ;; - *) - error "Unknown flag ${flag_name}" - return 1 + --id) + get_os_release_metadata ID + ;; + --version) + get_os_release_metadata VERSION_ID + ;; + --branch) + get_os_release_metadata VERSION_ID | sed 's/\..*//' + ;; + --codename) + get_os_release_metadata VERSION_CODENAME + ;; + *) + error "Unknown flag ${flag_name}" + return 1 + ;; esac } @@ -255,14 +257,14 @@ get_machine_size() { # Validate arguments while [[ "$#" -gt 0 ]]; do case "$1" in - --memory) - shift - memory="${1:?missing memory}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; + --memory) + shift + memory="${1:?missing memory}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; esac shift done @@ -314,7 +316,7 @@ convert_to_mb() { size="${BASH_REMATCH[1]}" unit="${BASH_REMATCH[2]}" if [[ "$unit" = "g" || "$unit" = "G" ]]; then - amount="$((size * 1024))" + amount="$((size * 1024))" else amount="$size" fi @@ -322,7 +324,6 @@ convert_to_mb() { echo "$amount" } - ######################### # Redirects output to /dev/null if debug mode is disabled # Globals: @@ -333,7 +334,7 @@ convert_to_mb() { # None ######################### debug_execute() { - if ${BITNAMI_DEBUG:-false}; then + if is_boolean_yes "${BITNAMI_DEBUG:-false}"; then "$@" else "$@" >/dev/null 2>&1 @@ -355,8 +356,8 @@ retry_while() { local sleep_time="${3:-5}" local return_value=1 - read -r -a command <<< "$cmd" - for ((i = 1 ; i <= retries ; i+=1 )); do + read -r -a command <<<"$cmd" + for ((i = 1; i <= retries; i += 1)); do "${command[@]}" && return_value=0 && break sleep "$sleep_time" done @@ -383,35 +384,36 @@ generate_random_string() { # Validate arguments while [[ "$#" -gt 0 ]]; do case "$1" in - -t|--type) - shift - type="$1" - ;; - -c|--count) - shift - count="$1" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; + -t | --type) + shift + type="$1" + ;; + -c | --count) + shift + count="$1" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; esac shift done # Validate type case "$type" in - ascii) - filter="[:print:]" - ;; - alphanumeric) - filter="a-zA-Z0-9" - ;; - numeric) - filter="0-9" - ;; - *) + ascii) + filter="[:print:]" + ;; + alphanumeric) + filter="a-zA-Z0-9" + ;; + numeric) + filter="0-9" + ;; + *) echo "Invalid type ${type}" >&2 return 1 + ;; esac # Obtain count + 10 lines from /dev/urandom to ensure that the resulting string has the expected size # Note there is a very small chance of strings starting with EOL character @@ -457,7 +459,7 @@ convert_to_hex() { local -r str=${1:?missing input string} local -i iterator local char - for ((iterator=0; iterator<${#str}; iterator++)); do + for ((iterator = 0; iterator < ${#str}; iterator++)); do char=${str:iterator:1} printf '%x' "'${char}" done diff --git a/bitnami/drupal-nginx/README.md b/bitnami/drupal-nginx/README.md index 9a856f5d768f..0c2bd5fe5fcb 100644 --- a/bitnami/drupal-nginx/README.md +++ b/bitnami/drupal-nginx/README.md @@ -37,7 +37,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`9`, `9-debian-10`, `9.3.0`, `9.3.0-debian-10-r14`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.3.0-debian-10-r14/9/debian-10/Dockerfile) +* [`9`, `9-debian-10`, `9.3.0`, `9.3.0-debian-10-r15`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.3.0-debian-10-r15/9/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/drupal-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-drupal-nginx).