From f6781df4f8b06eb712cdd28b495ecaecc739ae40 Mon Sep 17 00:00:00 2001
From: Adam <897017+asemy@users.noreply.github.com>
Date: Sat, 16 Oct 2021 23:36:33 +0200
Subject: [PATCH] rm dupe'd command, move comment

---
 modules/kafka/docker-compose.yml | 2 +-
 modules/kafka/kafka.Dockerfile   | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/kafka/docker-compose.yml b/modules/kafka/docker-compose.yml
index 55217c6..d7ab38b 100644
--- a/modules/kafka/docker-compose.yml
+++ b/modules/kafka/docker-compose.yml
@@ -11,4 +11,4 @@ services:
         KAFKA_DL_URL: "https://dlcdn.apache.org/kafka/3.0.0/kafka_2.13-3.0.0.tgz"
     ports:
       - "9092:9092"
-      - "9093:9093"
\ No newline at end of file
+      - "9093:9093"
diff --git a/modules/kafka/kafka.Dockerfile b/modules/kafka/kafka.Dockerfile
index 5297d14..88a8d8a 100644
--- a/modules/kafka/kafka.Dockerfile
+++ b/modules/kafka/kafka.Dockerfile
@@ -15,6 +15,8 @@ RUN echo "Downloading Kafka from $KAFKA_DL_URL" \
  && ls -la
 
 
+# KRaft (aka KIP-500) mode Preview Release
+# https://github.com/apache/kafka/blob/041b76dc57f096be2a2d7532d917122992bff6e2/config/kraft/README.md
 FROM openjdk:11
 
 WORKDIR /kafka
@@ -27,20 +29,15 @@ VOLUME /tmp/kraft-combined-logs
 # listeners, controller.quorum.voters
 EXPOSE 9092, 9093
 
-# KRaft (aka KIP-500) mode Preview Release
-# https://github.com/apache/kafka/blob/041b76dc57f096be2a2d7532d917122992bff6e2/config/kraft/README.md
-
 # Generate a cluster ID
 RUN echo "$(./bin/kafka-storage.sh random-uuid)" > cluster_id \
  && echo "Generated a Kafka Cluster ID: $(cat cluster_id)"
 
 # Format storage directories
-RUN ./bin/kafka-storage.sh format -t "$(cat cluster_id)" -c ./config/kraft/server.properties
-
-# launch the broker in KRaft mode, which means that it runs without ZooKeeper
 RUN ./bin/kafka-storage.sh format \
   --ignore-formatted \
   --config ./config/kraft/server.properties \
   --cluster-id "$(cat cluster_id)"
 
+# launch the broker in KRaft mode, which means that it runs without ZooKeeper
 ENTRYPOINT ["./bin/kafka-server-start.sh", "./config/kraft/server.properties"]