diff --git a/bitnami/drupal-nginx/9/debian-11/Dockerfile b/bitnami/drupal-nginx/9/debian-11/Dockerfile index ce8c8a67b5a9..1afdeb592a3b 100644 --- a/bitnami/drupal-nginx/9/debian-11/Dockerfile +++ b/bitnami/drupal-nginx/9/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-05-17T08:37:58Z" \ + org.opencontainers.image.created="2023-05-21T13:56:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.5.9-debian-11-r5" \ + org.opencontainers.image.ref.name="9.5.9-debian-11-r6" \ org.opencontainers.image.title="drupal-nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="9.5.9" @@ -19,14 +19,14 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -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 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 openssl procps unzip zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "php-8.1.19-1-linux-${OS_ARCH}-debian-11" \ - "nginx-1.23.4-3-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.3-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-5-linux-${OS_ARCH}-debian-11" \ - "drupal-9.5.9-1-linux-${OS_ARCH}-debian-11" \ + "php-8.1.19-2-linux-${OS_ARCH}-debian-11" \ + "nginx-1.23.4-4-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.3-1-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-6-linux-${OS_ARCH}-debian-11" \ + "drupal-9.5.9-2-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 0971fcc72d3d..3107ff8ff8c5 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 @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "9.5.9-1" + "version": "9.5.9-2" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.3-0" + "version": "10.11.3-1" }, "nginx": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.23.4-3" + "version": "1.23.4-4" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.19-1" + "version": "8.1.19-2" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-5" + "version": "1.0.5-6" } } \ 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 8dffa1576177..ef12f1cf24b7 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 @@ -652,7 +652,12 @@ nginx_generate_sample_certs() { SSL_EXT="subjectAltName=DNS:example.com,DNS:www.example.com,IP:127.0.0.1" rm -f "$SSL_KEY_FILE" "$SSL_CERT_FILE" openssl genrsa -out "$SSL_KEY_FILE" 4096 - openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" -addext "$SSL_EXT" + # OpenSSL version 1.0.x does not use the same parameters as OpenSSL >= 1.1.x + if [[ "$(openssl version | grep -oE "[0-9]+\.[0-9]+")" == "1.0" ]]; then + openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" + else + openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" -addext "$SSL_EXT" + fi openssl x509 -req -sha256 -in "$SSL_CSR_FILE" -signkey "$SSL_KEY_FILE" -out "$SSL_CERT_FILE" -days 1825 -extfile <(echo -n "$SSL_EXT") rm -f "$SSL_CSR_FILE" else diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh index 58259b072314..93964da92f41 100755 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh +++ b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh @@ -64,3 +64,9 @@ ln -sf /certs "${NGINX_CONF_DIR}/bitnami/certs" ln -sf "/dev/stdout" "${NGINX_LOGS_DIR}/access.log" ln -sf "/dev/stderr" "${NGINX_LOGS_DIR}/error.log" + +# This file is necessary for avoiding the error +# "unable to write random state" +# Source: https://stackoverflow.com/questions/94445/using-openssl-what-does-unable-to-write-random-state-mean + +touch /.rnd && chmod g+rw /.rnd