X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=d63d229b3e86b7190706c5c9ce62f5cf84ba9e10;hb=17360fbf2f944f6818c748ed1235264b7d8d28a4;hp=985d1df83ba9979a06d2c4b22db155a250c360e8;hpb=77f3fbcdd2cb4dbb023414f56c6ffdb64e66d999;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index 985d1df..d63d229 100755
--- a/README.sh
+++ b/README.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 
-IMAGE=juplo/spring-consumer-json:1.0-SNAPSHOT
+IMAGE=juplo/spring-consumer--json:1.0-SNAPSHOT
 
 if [ "$1" = "cleanup" ]
 then
-  docker-compose -f docker/docker-compose.yml down -v --remove-orphans
+  docker-compose -f docker/docker-compose.yml down -t0 -v --remove-orphans
   mvn clean
   exit
 fi
 
-docker-compose -f docker/docker-compose.yml up -d kafka-1 kafka-2 kafka-3 cli
+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 consumer-1 consumer-2
 
 if [[
@@ -23,8 +23,12 @@ else
   docker image ls $IMAGE
 fi
 
-docker-compose -f docker/docker-compose.yml up -d
-docker-compose -f docker/docker-compose.yml logs -f setup
+echo "Waiting for the Kafka-Cluster to become ready..."
+docker-compose -f docker/docker-compose.yml run --rm cli cub kafka-ready -b kafka:9092 3 60 > /dev/null 2>&1 || exit 1
+
+docker-compose -f docker/docker-compose.yml up -t0 -d cli
+
+docker-compose -f docker/docker-compose.yml up -d producer consumer-1 consumer-2
 
 while ! [[ $(http 0:8080/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for producer..."; sleep 1; done
 while ! [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-1..."; sleep 1; done
@@ -35,10 +39,11 @@ echo 6  | http -v :8080/peter
 echo 77 | http -v :8080/klaus
 # end::nachrichten[]
 
-echo "Writing poison pill..."
-# tag::poisonpill[]
-echo 'BOOM!' | kafkacat -P -b :9092 -t test
-# end::poisonpill[]
+echo "Writing logic error..."
+# tag::logicerror[]
+echo 66 | http -v :8080/peter?error=1
+# end::logicerror[]
+echo 7  | http -v :8080/klaus
 
 docker-compose -f docker/docker-compose.yml logs -f consumer-1 consumer-2