From 549bcdbf91509b2dee92fca40f361536f587920b Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 3 Jul 2023 09:40:39 +0200
Subject: [PATCH] [bitnami/spring-cloud-dataflow] Release 2.10.3-debian-11-r19
 (#39726)

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

diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile
index eb68727453b8..4a0ad3e20436 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile
+++ b/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile
@@ -7,10 +7,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-06-27T05:50:53Z" \
+      org.opencontainers.image.created="2023-07-03T07:09:43Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.10.3-debian-11-r17" \
+      org.opencontainers.image.ref.name="2.10.3-debian-11-r19" \
       org.opencontainers.image.title="spring-cloud-dataflow" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.10.3"
@@ -27,7 +27,7 @@ RUN install_packages ca-certificates curl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "java-17.0.7-7-2-linux-${OS_ARCH}-debian-11" \
-      "yq-4.34.1-1-linux-${OS_ARCH}-debian-11" \
+      "yq-4.34.1-6-linux-${OS_ARCH}-debian-11" \
       "spring-cloud-dataflow-2.10.3-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
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 a77d4e206514..bc27401db680 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
@@ -15,6 +15,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.34.1-1"
+        "version": "4.34.1-6"
     }
 }
\ 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 08fffa531ef1..107f54e6b5c9 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
@@ -106,8 +106,6 @@ generate_cron_conf() {
     local schedule="* * * * *"
     local clean="true"
 
-    local clean="true"
-
     # Parse optional CLI flags
     shift 2
     while [[ "$#" -gt 0 ]]; do
@@ -133,7 +131,12 @@ generate_cron_conf() {
 
     mkdir -p /etc/cron.d
     if "$clean"; then
-        echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name"
+        cat > "/etc/cron.d/${service_name}" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
+${schedule} ${run_as} ${cmd}
+EOF
     else
         echo "${schedule} ${run_as} ${cmd}" >> /etc/cron.d/"$service_name"
     fi
@@ -189,7 +192,10 @@ generate_monit_conf() {
 
     is_boolean_yes "$disabled" && conf_suffix=".disabled"
     mkdir -p "$monit_conf_dir"
-    cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
+    cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 check process ${service_name}
   with pidfile "${pid_file}"
   start program = "${start_command}" with timeout 90 seconds
@@ -248,7 +254,10 @@ generate_logrotate_conf() {
     done
 
     mkdir -p "$logrotate_conf_dir"
-    cat <<EOF | sed '/^\s*$/d' >"${logrotate_conf_dir}/${service_name}"
+    cat <<EOF | sed '/^\s*$/d' > "${logrotate_conf_dir}/${service_name}"
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 ${log_path} {
   ${period}
   rotate ${rotations}
@@ -393,6 +402,9 @@ generate_systemd_conf() {
     fi
     # Generate the Systemd unit
     cat > "$service_file" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 [Unit]
 Description=Bitnami service for ${name}
 # Starting/stopping the main bitnami service should cause the same effect for this service