From 4a9dfdf7d79741e8d0231df4cb558aca65db51a0 Mon Sep 17 00:00:00 2001
From: DarkIsDude <edouard.comtet@gmail.com>
Date: Wed, 3 Jun 2026 15:21:57 +0200
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20wrap=20kafka-server-start.sh?=
 =?UTF-8?q?=20to=20propagate=20broker=20exit=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue: ZENKO-5288
---
 solution/kafka/Dockerfile | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/solution/kafka/Dockerfile b/solution/kafka/Dockerfile
index 8656bb1ffb..903462294c 100644
--- a/solution/kafka/Dockerfile
+++ b/solution/kafka/Dockerfile
@@ -41,4 +41,14 @@ COPY log4j.properties ${KAFKA_HOME}/config/
 
 RUN chmod a+x ${KAFKA_HOME}/bin/*.sh
 
+RUN mv ${KAFKA_HOME}/bin/kafka-server-start.sh ${KAFKA_HOME}/bin/kafka-server-start-real.sh && \
+    { \
+      echo '#!/bin/bash'; \
+      echo '"$(dirname "$0")/kafka-server-start-real.sh" "$@"'; \
+      echo 'KAFKA_EXIT=$?'; \
+      echo 'printf "%d" "$KAFKA_EXIT" > /var/run/kafka-exit/code'; \
+      echo 'exit "$KAFKA_EXIT"'; \
+    } > ${KAFKA_HOME}/bin/kafka-server-start.sh && \
+    chmod +x ${KAFKA_HOME}/bin/kafka-server-start.sh
+
 CMD ["kafka-server-start.sh"]

From 7783b785005d4bf240d28acb23529ca34ccb2887 Mon Sep 17 00:00:00 2001
From: DarkIsDude <edouard.comtet@gmail.com>
Date: Thu, 4 Jun 2026 15:57:37 +0200
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20wrap=20kafka-server-start.sh?=
 =?UTF-8?q?=20to=20propagate=20broker=20exit=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue: ZENKO-5288
---
 solution/kafka/Dockerfile            | 12 +++---------
 solution/kafka/kafka-server-start.sh |  5 +++++
 2 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 solution/kafka/kafka-server-start.sh

diff --git a/solution/kafka/Dockerfile b/solution/kafka/Dockerfile
index 903462294c..42987848e2 100644
--- a/solution/kafka/Dockerfile
+++ b/solution/kafka/Dockerfile
@@ -41,14 +41,8 @@ COPY log4j.properties ${KAFKA_HOME}/config/
 
 RUN chmod a+x ${KAFKA_HOME}/bin/*.sh
 
-RUN mv ${KAFKA_HOME}/bin/kafka-server-start.sh ${KAFKA_HOME}/bin/kafka-server-start-real.sh && \
-    { \
-      echo '#!/bin/bash'; \
-      echo '"$(dirname "$0")/kafka-server-start-real.sh" "$@"'; \
-      echo 'KAFKA_EXIT=$?'; \
-      echo 'printf "%d" "$KAFKA_EXIT" > /var/run/kafka-exit/code'; \
-      echo 'exit "$KAFKA_EXIT"'; \
-    } > ${KAFKA_HOME}/bin/kafka-server-start.sh && \
-    chmod +x ${KAFKA_HOME}/bin/kafka-server-start.sh
+RUN mv ${KAFKA_HOME}/bin/kafka-server-start.sh ${KAFKA_HOME}/bin/kafka-server-start-real.sh
+
+COPY --chmod=755 kafka-server-start.sh ${KAFKA_HOME}/bin/kafka-server-start.sh
 
 CMD ["kafka-server-start.sh"]
diff --git a/solution/kafka/kafka-server-start.sh b/solution/kafka/kafka-server-start.sh
new file mode 100644
index 0000000000..9ffc256637
--- /dev/null
+++ b/solution/kafka/kafka-server-start.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+"$(dirname "$0")/kafka-server-start-real.sh" "$@"
+KAFKA_EXIT=$?
+printf "%d" "$KAFKA_EXIT" > /var/run/kafka-exit/code
+exit "$KAFKA_EXIT"