From 732ff8a744b2abc59627928f88c354c57afeb958 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Sat, 9 Dec 2023 02:41:50 +0100
Subject: [PATCH] [bitnami/nginx] Release 1.25.3-debian-11-r2 (#53673)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/nginx/1.25/debian-11/Dockerfile        | 18 +++++++++---------
 .../opt/bitnami/.bitnami_components.json       |  2 +-
 .../debian-11/prebuildfs/usr/sbin/run-script   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bitnami/nginx/1.25/debian-11/Dockerfile b/bitnami/nginx/1.25/debian-11/Dockerfile
index 8c76c824e839..11ca36c2dd7f 100644
--- a/bitnami/nginx/1.25/debian-11/Dockerfile
+++ b/bitnami/nginx/1.25/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-11-09T00:31:29Z" \
+      org.opencontainers.image.created="2023-12-09T01:05:31Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.25.3-debian-11-r1" \
+      org.opencontainers.image.ref.name="1.25.3-debian-11-r2" \
       org.opencontainers.image.title="nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.25.3"
@@ -21,21 +21,21 @@ ENV HOME="/" \
     OS_NAME="linux"
 
 COPY prebuildfs /
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl1.1 openssl procps zlib1g
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \
+      "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \
       "nginx-1.25.3-1-linux-${OS_ARCH}-debian-11" \
-    ) && \
+    ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
         curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \
         curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \
-      fi && \
-      sha256sum -c "${COMPONENT}.tar.gz.sha256" && \
-      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+      fi ; \
+      sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
+      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \
       rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
     done
 RUN apt-get autoremove --purge -y curl && \
diff --git a/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index f9968d292a82..6f0973799e3d 100644
--- a/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,6 +9,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.0.6-3"
+        "version": "1.0.6-4"
     }
 }
\ No newline at end of file
diff --git a/bitnami/nginx/1.25/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/nginx/1.25/debian-11/prebuildfs/usr/sbin/run-script
index 4ca0f897277e..b7a5bf1e50bf 100755
--- a/bitnami/nginx/1.25/debian-11/prebuildfs/usr/sbin/run-script
+++ b/bitnami/nginx/1.25/debian-11/prebuildfs/usr/sbin/run-script
@@ -10,7 +10,7 @@ fi
 
 script=$1
 exit_code="${2:-96}"
-fail_if_not_present="${3:-n}"
+fail_if_not_present="${3:-y}"
 
 if test -f "$script"; then
   sh $script