From 2b6d6568825a25ab7a0a2abc214805663d2bb919 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 9 Dec 2024 23:43:46 +0100
Subject: [PATCH] [bitnami/kafka] Release kafka-3.5.2-debian-12-r30 (#75610)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
---
 bitnami/kafka/3.5/debian-12/Dockerfile                    | 8 ++++----
 .../prebuildfs/opt/bitnami/.bitnami_components.json       | 4 ++--
 .../rootfs/opt/bitnami/scripts/java/entrypoint.sh         | 5 +++++
 .../3.5/debian-12/rootfs/opt/bitnami/scripts/kafka-env.sh | 4 ++++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/bitnami/kafka/3.5/debian-12/Dockerfile b/bitnami/kafka/3.5/debian-12/Dockerfile
index cd7e5f3f52fe..59963aff831c 100644
--- a/bitnami/kafka/3.5/debian-12/Dockerfile
+++ b/bitnami/kafka/3.5/debian-12/Dockerfile
@@ -9,11 +9,11 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-11-09T21:23:39Z" \
+      org.opencontainers.image.created="2024-12-09T21:52:27Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/kafka/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.5.2-debian-12-r29" \
+      org.opencontainers.image.ref.name="3.5.2-debian-12-r30" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/kafka" \
       org.opencontainers.image.title="kafka" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -30,8 +30,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "wait-for-port-1.0.8-7-linux-${OS_ARCH}-debian-12" \
-      "render-template-1.0.7-7-linux-${OS_ARCH}-debian-12" \
+      "wait-for-port-1.0.8-8-linux-${OS_ARCH}-debian-12" \
+      "render-template-1.0.7-8-linux-${OS_ARCH}-debian-12" \
       "java-17.0.13-12-1-linux-${OS_ARCH}-debian-12" \
       "kafka-3.5.2-6-linux-${OS_ARCH}-debian-12" \
     ) ; \
diff --git a/bitnami/kafka/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kafka/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index c347e3d359ff..6e09edd5daf6 100644
--- a/bitnami/kafka/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/kafka/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,12 +15,12 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.7-7"
+        "version": "1.0.7-8"
     },
     "wait-for-port": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.8-7"
+        "version": "1.0.8-8"
     }
 }
\ No newline at end of file
diff --git a/bitnami/kafka/3.5/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh b/bitnami/kafka/3.5/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
index 8557631d2549..38802fc0bfe9 100755
--- a/bitnami/kafka/3.5/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
+++ b/bitnami/kafka/3.5/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
@@ -13,6 +13,11 @@ set -o pipefail
 . /opt/bitnami/scripts/libbitnami.sh
 . /opt/bitnami/scripts/liblog.sh
 
+if [[ "$OS_FLAVOUR" =~ photon && "$APP_VERSION" =~ ^1.8 ]]; then
+  # Option --module-path is not supported by JAVA 1.8 since modules were added in version 1.9
+  unset JAVA_TOOL_OPTIONS
+fi
+
 print_welcome_page
 
 echo ""
diff --git a/bitnami/kafka/3.5/debian-12/rootfs/opt/bitnami/scripts/kafka-env.sh b/bitnami/kafka/3.5/debian-12/rootfs/opt/bitnami/scripts/kafka-env.sh
index f58958279ce8..e1621b93e808 100644
--- a/bitnami/kafka/3.5/debian-12/rootfs/opt/bitnami/scripts/kafka-env.sh
+++ b/bitnami/kafka/3.5/debian-12/rootfs/opt/bitnami/scripts/kafka-env.sh
@@ -49,6 +49,7 @@ kafka_env_vars=(
     KAFKA_CLIENT_USERS
     KAFKA_CLIENT_PASSWORDS
     KAFKA_HEAP_OPTS
+    JAVA_TOOL_OPTIONS
 )
 for env_var in "${kafka_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
@@ -114,4 +115,7 @@ export KAFKA_CLIENT_PASSWORDS="${KAFKA_CLIENT_PASSWORDS:-bitnami}"
 # Java settings
 export KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS:--Xmx1024m -Xms1024m}"
 
+# Java settings
+export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS:-}"
+
 # Custom environment variables may be defined below