From 8ee0cb396cc8646a1e467b12f15cd01028482bcf Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Fri, 24 Jun 2022 15:01:24 +0200
Subject: [PATCH] tidy up kafka cluster entry script

---
 modules/infra-kafka-cluster/src/entrypoint.sh    | 3 ++-
 modules/infra-kafka-cluster/src/kafka.Dockerfile | 8 +-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/infra-kafka-cluster/src/entrypoint.sh b/modules/infra-kafka-cluster/src/entrypoint.sh
index fe91dbe..9a21f3f 100644
--- a/modules/infra-kafka-cluster/src/entrypoint.sh
+++ b/modules/infra-kafka-cluster/src/entrypoint.sh
@@ -1,4 +1,5 @@
-./bin/kafka-storage.sh format \
+# Format storage directories
+RUN ./bin/kafka-storage.sh format \
   --ignore-formatted \
   --config ./server.properties \
   --cluster-id "$(cat cluster_id)"
diff --git a/modules/infra-kafka-cluster/src/kafka.Dockerfile b/modules/infra-kafka-cluster/src/kafka.Dockerfile
index 60c1507..3927cfa 100644
--- a/modules/infra-kafka-cluster/src/kafka.Dockerfile
+++ b/modules/infra-kafka-cluster/src/kafka.Dockerfile
@@ -36,13 +36,7 @@ RUN ./bin/kafka-storage.sh random-uuid > cluster_id \
  && echo "Generated a Kafka Cluster ID: $(cat cluster_id)"
 
 COPY ./kafka-server.properties ./server.properties
-COPY ./entrypoint.sh ./entrypoint.sh
-
-# Format storage directories
-RUN ./bin/kafka-storage.sh format \
-  --ignore-formatted \
-  --config ./server.properties \
-  --cluster-id "$(cat cluster_id)"
+COPY --chmod=755 ./entrypoint.sh ./entrypoint.sh
 
 # launch the broker in KRaft mode, which means that it runs without ZooKeeper
 ENTRYPOINT ["./entrypoint.sh"]