From 3ac1670b8c1ef9ccab510bb7e25a97f92d8b8b50 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 3 Apr 2023 11:44:57 +0200
Subject: [PATCH] [bitnami/nginx] Release 1.22.1-debian-11-r55 (#28960)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: Fran Mulero <fmulero@vmware.com>
---
 bitnami/nginx/1.22/debian-11/Dockerfile              | 10 +++++-----
 .../prebuildfs/opt/bitnami/.bitnami_components.json  |  6 +++---
 .../prebuildfs/opt/bitnami/scripts/libservice.sh     | 12 +++++++++---
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/bitnami/nginx/1.22/debian-11/Dockerfile b/bitnami/nginx/1.22/debian-11/Dockerfile
index 1d9fda87e0b5..cde58fc2a136 100644
--- a/bitnami/nginx/1.22/debian-11/Dockerfile
+++ b/bitnami/nginx/1.22/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-03-28T00:12:54Z" \
+      org.opencontainers.image.created="2023-04-01T14:58:49Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.22.1-debian-11-r54" \
+      org.opencontainers.image.ref.name="1.22.1-debian-11-r55" \
       org.opencontainers.image.title="nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.22.1"
@@ -22,9 +22,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl1.1 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "render-template-1.0.5-2-linux-${OS_ARCH}-debian-11" \
-      "nginx-1.22.1-6-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
+      "render-template-1.0.5-4-linux-${OS_ARCH}-debian-11" \
+      "nginx-1.22.1-8-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 8892376d856f..919d7860d1b4 100644
--- a/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,18 +3,18 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.16.0-3"
+        "version": "1.16.0-5"
     },
     "nginx": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.22.1-6"
+        "version": "1.22.1-8"
     },
     "render-template": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.0.5-2"
+        "version": "1.0.5-4"
     }
 }
\ No newline at end of file
diff --git a/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index 6fcb304d34cc..d70cf0779ec8 100644
--- a/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -279,7 +279,7 @@ remove_logrotate_conf() {
 # Flags:
 #   --custom-service-content - Custom content to add to the [service] block
 #   --environment - Environment variable to define (multiple --environment options may be passed)
-#   --environment-file - Text file with environment variables
+#   --environment-file - Text file with environment variables (multiple --environment-file options may be passed)
 #   --exec-start - Start command (required)
 #   --exec-start-pre - Pre-start command (optional)
 #   --exec-start-post - Post-start command (optional)
@@ -330,7 +330,6 @@ generate_systemd_conf() {
             | --type \
             | --user \
             | --group \
-            | --environment-file \
             | --exec-start \
             | --exec-stop \
             | --exec-reload \
@@ -368,6 +367,12 @@ generate_systemd_conf() {
                 [[ -n "$environment" ]] && environment+=$'\n'
                 environment+="Environment=${1:?"--environment value is missing"}"
                 ;;
+            --environment-file)
+                shift
+                # It is possible to add multiple environment-file lines
+                [[ -n "$environment_file" ]] && environment_file+=$'\n'
+                environment_file+="EnvironmentFile=${1:?"--environment-file value is missing"}"
+                ;;
             *)
                 echo "Invalid command line flag ${1}" >&2
                 return 1
@@ -435,7 +440,8 @@ EOF
         cat >> "$service_file" <<< "$environment"
     fi
     if [[ -n "$environment_file" ]]; then
-        cat >> "$service_file" <<< "EnvironmentFile=${environment_file}"
+        # This variable may contain multiple EnvironmentFile= directives
+        cat >> "$service_file" <<< "$environment_file"
     fi
     # Logging
     if [[ -n "$standard_output" ]]; then