From 90a84fe0bb5e27590d1bd57c84a6cacd7a64ad34 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 16 May 2023 07:42:08 +0100 Subject: [PATCH] [bitnami/nginx] Release 1.23.4-debian-11-r17 (#34137) Signed-off-by: Bitnami Containers --- bitnami/nginx/1.23/debian-11/Dockerfile | 4 ++-- .../1.23/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bitnami/nginx/1.23/debian-11/Dockerfile b/bitnami/nginx/1.23/debian-11/Dockerfile index 7d4a37f8421c..1b7beb010e9f 100644 --- a/bitnami/nginx/1.23/debian-11/Dockerfile +++ b/bitnami/nginx/1.23/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-14T12:29:54Z" \ + org.opencontainers.image.created="2023-05-16T06:25:42Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.23.4-debian-11-r16" \ + org.opencontainers.image.ref.name="1.23.4-debian-11-r17" \ org.opencontainers.image.title="nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.23.4" diff --git a/bitnami/nginx/1.23/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/nginx/1.23/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh index d6c0c60f2cfb..8dffa1576177 100644 --- a/bitnami/nginx/1.23/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh +++ b/bitnami/nginx/1.23/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh @@ -643,8 +643,8 @@ nginx_generate_sample_certs() { local certs_dir="${NGINX_CONF_DIR}/bitnami/certs" if ! is_boolean_yes "$NGINX_SKIP_SAMPLE_CERTS" && [[ ! -f "${certs_dir}/server.crt" ]]; then - ensure_dir_exists "$certs_dir" - if is_file_writable "${certs_dir}/server.crt"; then + # Check certificates directory exists and is writable + if [[ -d "$certs_dir" && -w "$certs_dir" ]]; then SSL_KEY_FILE="${certs_dir}/server.key" SSL_CERT_FILE="${certs_dir}/server.crt" SSL_CSR_FILE="${certs_dir}/server.csr" @@ -656,7 +656,7 @@ nginx_generate_sample_certs() { 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 - warn "The certificates directories '${certs_dir}' is not writable, skipping sample HTTPS certificates generation" + warn "The certificates directories '${certs_dir}' does not exist or is not writable, skipping sample HTTPS certificates generation" fi fi }