From a67da5d2fd12091823bbc6c02e6d81525ddd0ebc Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 17 Feb 2023 18:12:02 +0100 Subject: [PATCH] [bitnami/drupal-nginx] Release 9.5.3-debian-11-r5 (#24276) Signed-off-by: Bitnami Containers --- bitnami/drupal-nginx/9/debian-11/Dockerfile | 20 ++++++++-------- .../opt/bitnami/.bitnami_components.json | 24 +++++++++---------- .../rootfs/opt/bitnami/scripts/libnginx.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx/setup.sh | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bitnami/drupal-nginx/9/debian-11/Dockerfile b/bitnami/drupal-nginx/9/debian-11/Dockerfile index dbd014b1884c..b6fd5a2a7b9a 100644 --- a/bitnami/drupal-nginx/9/debian-11/Dockerfile +++ b/bitnami/drupal-nginx/9/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-17T14:54:56Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.5.3-debian-11-r4" \ - org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/drupal-nginx" \ + org.opencontainers.image.ref.name="9.5.3-debian-11-r5" \ org.opencontainers.image.title="drupal-nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="9.5.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-9.5.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-9.5.3-1-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b225e0089b56..f4c0e7b70b07 100644 --- a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,44 +1,44 @@ { "drupal": { "arch": "amd64", - "digest": "734bfb92ff35bc87791c87f05c692a676ddf64cd9a8f948a93eb722befb545a0", + "digest": "b90335c71189ea6649fd06893502c6aeb535a05d3428f466a78dee1bf65b6d9b", "distro": "debian-11", "type": "NAMI", - "version": "9.5.3-0" + "version": "9.5.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" } } \ No newline at end of file diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh index bde1ebb2822f..b622b2444474 100644 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh +++ b/bitnami/drupal-nginx/9/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" )" diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh index 789f05547b3d..3fdc013c4b9a 100755 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh +++ b/bitnami/drupal-nginx/9/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