From a8a686efe1e5a0a4d566de3d52c749efb9e5f7b6 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Thu, 17 Jul 2025 04:04:22 +0200
Subject: [PATCH] [bitnami/kafka] Release 4.0.0-debian-12-r9 (#83368)

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
---
 bitnami/kafka/4.0/debian-12/Dockerfile        |  5 ++-
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../rootfs/opt/bitnami/scripts/libkafka.sh    | 34 +++++++++++--------
 bitnami/kafka/4.0/debian-12/tags-info.yaml    |  5 ---
 4 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 bitnami/kafka/4.0/debian-12/tags-info.yaml

diff --git a/bitnami/kafka/4.0/debian-12/Dockerfile b/bitnami/kafka/4.0/debian-12/Dockerfile
index bd998d5bef15..1c9b5c4e65fd 100644
--- a/bitnami/kafka/4.0/debian-12/Dockerfile
+++ b/bitnami/kafka/4.0/debian-12/Dockerfile
@@ -9,10 +9,9 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-06-25T10:24:53Z" \
+      org.opencontainers.image.created="2025-07-17T01:49:43Z" \
       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.ref.name="4.0.0-debian-12-r8" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/kafka" \
       org.opencontainers.image.title="kafka" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -31,7 +30,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "jre-17.0.15-10-0-linux-${OS_ARCH}-debian-12" \
+      "jre-17.0.16-12-0-linux-${OS_ARCH}-debian-12" \
       "kafka-4.0.0-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/kafka/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kafka/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 0e355041f446..524edca54584 100644
--- a/bitnami/kafka/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/kafka/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "17.0.15-10-0"
+        "version": "17.0.16-12-0"
     },
     "kafka": {
         "arch": "amd64",
diff --git a/bitnami/kafka/4.0/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh b/bitnami/kafka/4.0/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh
index 856a5cb7aa48..dfe514f6cbe4 100644
--- a/bitnami/kafka/4.0/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh
+++ b/bitnami/kafka/4.0/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh
@@ -752,7 +752,8 @@ kafka_configure_ssl() {
             for file in "${files[@]}"; do
                 if grep -q "^[#\\s]*$key\s*=.*" "$file"; then
                     # Delete all lines from the certificate beginning to its end
-                    sed -i "/^[#\\s]*$key\s*=.*-----BEGIN/,/-----END/d" "$file"
+                    content="$(sed "/^[#\\s]*$key\s*=.*-----BEGIN/,/-----END/d" "$file")"
+                    echo "$content" > "$file"
                 fi
             done
         }
@@ -1082,23 +1083,28 @@ kafka_client_sasl_mechanism() {
 #   None
 ########################
 kafka_server_unify_conf() {
-    local -r remove_regexps=(
+    # Setting patterns to be commented
+    local -r remove_settings=(
         #Zookeeper
-        "s/^zookeeper\./#zookeeper./g"
-        "s/^group\.initial/#group.initial/g"
-        "s/^broker\./#broker./g"
-        "s/^node\./#node./g"
-        "s/^process\./#process./g"
-        "s/^listeners=/#listeners=/g"
-        "s/^listener\./#listener./g"
-        "s/^controller\./#controller./g"
-        "s/^inter\.broker/#inter.broker/g"
-        "s/^advertised\.listeners/#advertised.listeners/g"
+        "^zookeeper\."
+        "^group\.initial"
+        "^broker\."
+        "^node\."
+        "^process\."
+        "^listeners="
+        "^listener\."
+        "^controller\."
+        "^inter\.broker"
+        "^advertised\.listeners"
     )
 
     # Map environment variables to config properties
-    for regex in "${remove_regexps[@]}"; do
-        sed -i "${regex}" "$KAFKA_CONF_FILE"
+    for match_pattern in "${remove_settings[@]}"; do
+        # Replace beginning of line with comment
+        sub_pattern="${match_pattern/^/#}"
+        # Replace \. with .
+        sub_pattern="${sub_pattern/\\./.}"
+        replace_in_file "$KAFKA_CONF_FILE" "$match_pattern" "$sub_pattern"
     done
 }
 
diff --git a/bitnami/kafka/4.0/debian-12/tags-info.yaml b/bitnami/kafka/4.0/debian-12/tags-info.yaml
deleted file mode 100644
index 7b91087f9bcf..000000000000
--- a/bitnami/kafka/4.0/debian-12/tags-info.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-rolling-tags:
-  - "4.0"
-  - 4.0-debian-12
-  - 4.0.0
-  - latest