From 31a7cb4ccdb80920781ed1f5c8c9931fa4d95f5b Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 22 Feb 2023 16:20:55 +0100
Subject: [PATCH] [bitnami/kafka] Release 3.4.0-debian-11-r4 (#24918)

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

diff --git a/bitnami/kafka/3.4/debian-11/Dockerfile b/bitnami/kafka/3.4/debian-11/Dockerfile
index d6584e5e0250..c3b748548aa1 100644
--- a/bitnami/kafka/3.4/debian-11/Dockerfile
+++ b/bitnami/kafka/3.4/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-20T16:32:31Z" \
+      org.opencontainers.image.created="2023-02-22T14:49:10Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.4.0-debian-11-r3" \
+      org.opencontainers.image.ref.name="3.4.0-debian-11-r4" \
       org.opencontainers.image.title="kafka" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.4.0"
@@ -23,11 +23,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "java-11.0.18-10-1-linux-${OS_ARCH}-debian-11" \
+      "java-11.0.18-10-2-linux-${OS_ARCH}-debian-11" \
       "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
       "wait-for-port-1.0.6-1-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \
-      "kafka-3.4.0-1-linux-${OS_ARCH}-debian-11" \
+      "kafka-3.4.0-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index a4bd8d0af211..ba98dc7ecac5 100644
--- a/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -8,17 +8,17 @@
     },
     "java": {
         "arch": "amd64",
-        "digest": "cd40a6df619d734d300324ad671f34323152e84682bc998da1330f1a7f0acfa6",
+        "digest": "be7aa8950dacdcd96b5308a246b86665d364f70675564f157bfc7594b383af1f",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "11.0.18-10-1"
+        "version": "11.0.18-10-2"
     },
     "kafka": {
         "arch": "amd64",
         "digest": "f40c411bc9bddb168fc34dabaf4ccf55f48743a539b21aa3b3f1311bb7a27f77",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.4.0-1"
+        "version": "3.4.0-2"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index f964ab09fcba..af64e198ad2d 100644
--- a/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/kafka/3.4/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