From e868069f57b1f56701f542482473f90b0d14658d Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 10 Apr 2023 22:11:25 +0200
Subject: [PATCH] [bitnami/kafka] Release 3.4.0-debian-11-r18 (#29795)

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

diff --git a/bitnami/kafka/3.4/debian-11/Dockerfile b/bitnami/kafka/3.4/debian-11/Dockerfile
index baa6cebe5c2f..4fd40858dc04 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-04-07T14:14:19Z" \
+      org.opencontainers.image.created="2023-04-10T19:28:18Z" \
       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-r17" \
+      org.opencontainers.image.ref.name="3.4.0-debian-11-r18" \
       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-4-linux-${OS_ARCH}-debian-11" \
+      "java-17.0.6-10-4-linux-${OS_ARCH}-debian-11" \
       "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
       "wait-for-port-1.0.6-4-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-4-linux-${OS_ARCH}-debian-11" \
-      "kafka-3.4.0-5-linux-${OS_ARCH}-debian-11" \
+      "kafka-3.4.0-6-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 19994d6d9dc8..a888d4703425 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
@@ -9,13 +9,13 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "11.0.18-10-4"
+        "version": "17.0.6-10-4"
     },
     "kafka": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.4.0-5"
+        "version": "3.4.0-6"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 5860791219cf..94745ebe419e 100644
--- a/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -112,10 +112,10 @@ is_web_server_running() {
 #########################
 web_server_start() {
     info "Starting $(web_server_type) in background"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl start "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
     fi
 }
 
@@ -130,10 +130,10 @@ web_server_start() {
 #########################
 web_server_stop() {
     info "Stopping $(web_server_type)"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl stop "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
     fi
 }
 
@@ -148,10 +148,10 @@ web_server_stop() {
 #########################
 web_server_restart() {
     info "Restarting $(web_server_type)"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl restart "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
     fi
 }
 
@@ -165,10 +165,10 @@ web_server_restart() {
 #   None
 #########################
 web_server_reload() {
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl reload "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
     fi
 }