[bitnami/nginx] Release nginx-1.26.2-debian-12-r6 (#72403)

Signed-off-by: Bitnami Bot <[email protected]>
bitnami · Sep 13, 2024 · c31ae93 · c31ae93
1 parent d1369a2
commit c31ae93
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/bitnami/nginx/1.26/debian-12/Dockerfile b/bitnami/nginx/1.26/debian-12/Dockerfile
@@ -7,11 +7,11 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-09-04T18:50:16Z" \
+      org.opencontainers.image.created="2024-09-13T07:00:04Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/nginx/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.26.2-debian-12-r5" \
+      org.opencontainers.image.ref.name="1.26.2-debian-12-r6" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nginx" \
       org.opencontainers.image.title="nginx" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl gettext libcrypt1 libgeoip1 libpcre3 libssl3 openssl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "render-template-1.0.7-3-linux-${OS_ARCH}-debian-12" \
+      "render-template-1.0.7-4-linux-${OS_ARCH}-debian-12" \
       "nginx-1.26.2-2-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \

diff --git a/bitnami/nginx/1.26/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx/1.26/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,6 +9,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.7-3"
+        "version": "1.0.7-4"
     }
 }
diff --git a/bitnami/nginx/1.26/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/nginx/1.26/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh
@@ -208,6 +208,15 @@ nginx_initialize() {
     fi
     nginx_configure "absolute_redirect" "$(is_boolean_yes "$NGINX_ENABLE_ABSOLUTE_REDIRECT" && echo "on" || echo "off" )"
     nginx_configure "port_in_redirect" "$(is_boolean_yes "$NGINX_ENABLE_PORT_IN_REDIRECT" && echo "on" || echo "off" )"
+    # Stream configuration
+    if is_boolean_yes "$NGINX_ENABLE_STREAM" && is_file_writable "$NGINX_CONF_FILE"; then
+        cat >> "$NGINX_CONF_FILE" <<EOF
+
+stream {
+    include  "${NGINX_STREAM_SERVER_BLOCKS_DIR}/*.conf";
+}
+EOF
+    fi
 }
 
 ########################

diff --git a/bitnami/nginx/1.26/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh b/bitnami/nginx/1.26/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh
@@ -27,6 +27,7 @@ nginx_env_vars=(
     NGINX_HTTP_PORT_NUMBER
     NGINX_HTTPS_PORT_NUMBER
     NGINX_SKIP_SAMPLE_CERTS
+    NGINX_ENABLE_STREAM
     NGINX_ENABLE_ABSOLUTE_REDIRECT
     NGINX_ENABLE_PORT_IN_REDIRECT
 )
@@ -54,6 +55,7 @@ export NGINX_HTDOCS_DIR="${NGINX_BASE_DIR}/html"
 export NGINX_TMP_DIR="${NGINX_BASE_DIR}/tmp"
 export NGINX_LOGS_DIR="${NGINX_BASE_DIR}/logs"
 export NGINX_SERVER_BLOCKS_DIR="${NGINX_CONF_DIR}/server_blocks"
+export NGINX_STREAM_SERVER_BLOCKS_DIR="${NGINX_CONF_DIR}/stream_server_blocks"
 export NGINX_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d"
 export NGINX_CONF_FILE="${NGINX_CONF_DIR}/nginx.conf"
 export NGINX_PID_FILE="${NGINX_TMP_DIR}/nginx.pid"
@@ -75,6 +77,7 @@ export WEB_SERVER_HTTP_PORT_NUMBER="$NGINX_HTTP_PORT_NUMBER"
 export NGINX_HTTPS_PORT_NUMBER="${NGINX_HTTPS_PORT_NUMBER:-}"
 export WEB_SERVER_HTTPS_PORT_NUMBER="$NGINX_HTTPS_PORT_NUMBER"
 export NGINX_SKIP_SAMPLE_CERTS="${NGINX_SKIP_SAMPLE_CERTS:-false}"
+export NGINX_ENABLE_STREAM="${NGINX_ENABLE_STREAM:-no}"
 export NGINX_ENABLE_ABSOLUTE_REDIRECT="${NGINX_ENABLE_ABSOLUTE_REDIRECT:-no}"
 export NGINX_ENABLE_PORT_IN_REDIRECT="${NGINX_ENABLE_PORT_IN_REDIRECT:-no}"
 

diff --git a/bitnami/nginx/1.26/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh b/bitnami/nginx/1.26/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh
@@ -39,7 +39,7 @@ rm -rf "${BITNAMI_ROOT_DIR}/certs" "${BITNAMI_ROOT_DIR}/server_blocks"
 
 # Ensure non-root user has write permissions on a set of directories
 chmod g+w "$NGINX_BASE_DIR"
-for dir in "$NGINX_VOLUME_DIR" "$NGINX_CONF_DIR" "$NGINX_INITSCRIPTS_DIR" "$NGINX_SERVER_BLOCKS_DIR" "${NGINX_CONF_DIR}/bitnami" "${NGINX_CONF_DIR}/bitnami/certs" "$NGINX_LOGS_DIR" "$NGINX_TMP_DIR" "$NGINX_DEFAULT_CONF_DIR"; do
+for dir in "$NGINX_VOLUME_DIR" "$NGINX_CONF_DIR" "$NGINX_INITSCRIPTS_DIR" "$NGINX_SERVER_BLOCKS_DIR" "$NGINX_STREAM_SERVER_BLOCKS_DIR" "${NGINX_CONF_DIR}/bitnami" "${NGINX_CONF_DIR}/bitnami/certs" "$NGINX_LOGS_DIR" "$NGINX_TMP_DIR" "$NGINX_DEFAULT_CONF_DIR"; do
     ensure_dir_exists "$dir"
     chmod -R g+rwX "$dir"
 done