Setup-Verbesserungen aus grundlagen/docker übernommen

[demos/kafka/training] / README.sh

diff --git a/README.sh b/README.sh
index 0daad74..da053d7 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 
-IMAGE=juplo/simple-producer:1.0-SNAPSHOT
+IMAGE=juplo/fire-forget:1.0-SNAPSHOT
 
 if [ "$1" = "cleanup" ]
 then
-  docker-compose down -v
+  docker-compose -f docker/docker-compose.yml down -t0 -v --remove-orphans
   mvn clean
   exit
 fi
 
-docker-compose up -d zookeeper kafka-1 kafka-2 kafka-3 cli
-docker-compose rm -svf producer
+docker-compose -f docker/docker-compose.yml up -d --remove-orphans kafka-1 kafka-2 kafka-3
+docker-compose -f docker/docker-compose.yml rm -svf producer
 
 if [[
   $(docker image ls -q $IMAGE) == "" ||
@@ -23,14 +23,15 @@ else
   docker image ls $IMAGE
 fi
 
-echo "Waiting for the Kafka-Cluster to become ready..."
-docker-compose exec cli cub kafka-ready -b kafka:9092 1 60 > /dev/null 2>&1 || exit 1
-docker-compose up setup
-docker-compose up -d
-sleep 5
+docker-compose -f docker/docker-compose.yml up --remove-orphans setup || exit 1
 
-docker-compose exec cli kafkacat -b kafka:9092 -t test -q -c 20 -f'topic=%t\tpartition=%p\toffset=%o\tkey=%k\tvalue=%s\n'
+docker-compose -f docker/docker-compose.yml up -t0 -d cli
+sleep 1
+docker-compose -f docker/docker-compose.yml logs setup
 
-docker-compose stop producer
-docker-compose exec cli kafkacat -b kafka:9092 -t test -q -e -f'topic=%t\tpartition=%p\toffset=%o\tkey=%k\tvalue=%s\n'
-docker-compose logs producer
+docker-compose -f docker/docker-compose.yml ps
+docker-compose -f docker/docker-compose.yml up producer
+
+# tag::kafkacat[]
+kafkacat -b :9092 -e -q -t test | wc -l
+# end::kafkacat[]