[bitnami/nginx] Release 1.23.3-debian-11-r29 (#25129)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

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-02-21T08:38:39Z" \
+      org.opencontainers.image.created="2023-02-23T20:55:27Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.23.3-debian-11-r28" \
+      org.opencontainers.image.ref.name="1.23.3-debian-11-r29" \
       org.opencontainers.image.title="nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.23.3"

bitnami/nginx/1.23/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh

@@ -305,6 +305,8 @@ generate_systemd_conf() {
     local exec_reload=""
     local restart="always"
     local pid_file=""
+    local standard_output="journal"
+    local standard_error=""
     # Parse CLI flags
     shift
     while [[ "$#" -gt 0 ]]; do
@@ -318,6 +320,8 @@ generate_systemd_conf() {
             | --exec-reload \
             | --restart \
             | --pid-file \
+            | --standard-output \
+            | --standard-error \
             )
                 var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
                 shift
@@ -362,36 +366,33 @@ ExecStart=${exec_start}
 EOF
     # Optional stop and reload commands
     if [[ -n "$exec_stop" ]]; then
-        cat >> "$service_file" <<EOF
+        cat >> "$service_file" <<< "ExecStop=${exec_stop}"
-ExecStop=${exec_stop}
-EOF
     fi
     if [[ -n "$exec_reload" ]]; then
-        cat >> "$service_file" <<EOF
+        cat >> "$service_file" <<< "ExecReload=${exec_reload}"
-ExecReload=${exec_reload}
-EOF
     fi
     # User and group
     if [[ -n "$user" ]]; then
-        cat >> "$service_file" <<EOF
+        cat >> "$service_file" <<< "User=${user}"
-User=${user}
-EOF
     fi
     if [[ -n "$group" ]]; then
-        cat >> "$service_file" <<EOF
+        cat >> "$service_file" <<< "Group=${group}"
-Group=${group}
-EOF
     fi
     # PID file allows to determine if the main process is running properly (for Restart=always)
     if [[ -n "$pid_file" ]]; then
-        cat >> "$service_file" <<EOF
+        cat >> "$service_file" <<< "PIDFile=${pid_file}"
-PIDFile=${pid_file}
-EOF
     fi
     # Environment flags (may be specified multiple times in a unit)
     if [[ -n "$environment" ]]; then
         cat >> "$service_file" <<< "$environment"
     fi
+    # Logging
+    if [[ -n "$standard_output" ]]; then
+        cat >> "$service_file" <<< "StandardOutput=${standard_output}"
+    fi
+    if [[ -n "$standard_error" ]]; then
+        cat >> "$service_file" <<< "StandardError=${standard_error}"
+    fi
     cat >> "$service_file" <<EOF
 Restart=${restart}
 # Optimizations
@@ -400,8 +401,6 @@ IgnoreSIGPIPE=no
 KillMode=mixed
 # Limits
 LimitNOFILE=infinity
-# Configure output to appear in instance console output
-StandardOutput=journal+console
 
 [Install]
 # Enabling/disabling the main bitnami service should cause the same effect for this service

bitnami/nginx/1.23/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh

@@ -47,7 +47,7 @@ nginx_patch_httpoxy_vulnerability
 # Configure default HTTP port
 nginx_configure_port "$NGINX_DEFAULT_HTTP_PORT_NUMBER"
 # Configure default HTTPS port
-nginx_configure_port "$NGINX_DEFAULT_HTTPS_PORT_NUMBER" "${BITNAMI_ROOT_DIR}/scripts/nginx/server_blocks/default-https-server-block.conf"
+nginx_configure_port "$NGINX_DEFAULT_HTTPS_PORT_NUMBER" "${BITNAMI_ROOT_DIR}/scripts/nginx/bitnami-templates/default-https-server-block.conf"
 
 # shellcheck disable=SC1091
 

bitnami/nginx/1.23/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh

@@ -32,7 +32,7 @@ nginx_custom_init_scripts
 
 # Configure HTTPS port number
 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"
+    cp "${BITNAMI_ROOT_DIR}/scripts/nginx/bitnami-templates/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"
 fi
 
 # Initialize NGINX