From 925f8f84838c1163ebea240cde35d9ce6206281c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 22 Feb 2023 02:11:03 +0100
Subject: [PATCH] [bitnami/spring-cloud-dataflow] Release 2.10.0-debian-11-r16
 (#24868)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 .../2/debian-11/Dockerfile                    |  8 ++---
 .../opt/bitnami/.bitnami_components.json      |  8 ++---
 .../opt/bitnami/scripts/libservice.sh         | 33 +++++++++----------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile
index 36bafcc598a2..42fc2f7e5b11 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile
+++ b/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile
@@ -4,10 +4,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-02-18T06:31:05Z" \
+      org.opencontainers.image.created="2023-02-22T00:42:37Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.10.0-debian-11-r15" \
+      org.opencontainers.image.ref.name="2.10.0-debian-11-r16" \
       org.opencontainers.image.title="spring-cloud-dataflow" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.10.0"
@@ -23,8 +23,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libgcc-s1 procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "java-1.8.362-1-linux-${OS_ARCH}-debian-11" \
-      "yq-4.30.8-2-linux-${OS_ARCH}-debian-11" \
+      "java-1.8.362-2-linux-${OS_ARCH}-debian-11" \
+      "yq-4.31.1-0-linux-${OS_ARCH}-debian-11" \
       "spring-cloud-dataflow-2.10.0-1-linux-${OS_ARCH}-debian-11" \
       "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
     ) && \
diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index c670fd9014ca..ffe45a23595a 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -8,10 +8,10 @@
     },
     "java": {
         "arch": "amd64",
-        "digest": "5bd5372669617e425c32344e8ce1558d9402474acf2c7ed8ccd54c3fbcca7ce1",
+        "digest": "0cb6f9d6d7247b2978176a29d50e6a9ebe853545757decaaaff1899a22ebf12c",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.8.362-1"
+        "version": "1.8.362-2"
     },
     "spring-cloud-dataflow": {
         "arch": "amd64",
@@ -22,9 +22,9 @@
     },
     "yq": {
         "arch": "amd64",
-        "digest": "2fcd60b9977991e83f7066cf6da2c319b21483cdc67597625af37fa753534faf",
+        "digest": "83bb15cc1ad5d561294aa058542a9160685b976c866a303208c10e7c08634a8f",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.30.8-2"
+        "version": "4.31.1-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index f964ab09fcba..af64e198ad2d 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/spring-cloud-dataflow/2/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
-ExecStop=${exec_stop}
-EOF
+        cat >> "$service_file" <<< "ExecStop=${exec_stop}"
     fi
     if [[ -n "$exec_reload" ]]; then
-        cat >> "$service_file" <<EOF
-ExecReload=${exec_reload}
-EOF
+        cat >> "$service_file" <<< "ExecReload=${exec_reload}"
     fi
     # User and group
     if [[ -n "$user" ]]; then
-        cat >> "$service_file" <<EOF
-User=${user}
-EOF
+        cat >> "$service_file" <<< "User=${user}"
     fi
     if [[ -n "$group" ]]; then
-        cat >> "$service_file" <<EOF
-Group=${group}
-EOF
+        cat >> "$service_file" <<< "Group=${group}"
     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
-PIDFile=${pid_file}
-EOF
+        cat >> "$service_file" <<< "PIDFile=${pid_file}"
     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