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

diff --git a/README.sh b/README.sh
index 44e2ecf..985d1df 100755
--- a/README.sh
+++ b/README.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 
-IMAGE=juplo/simple-consumer:1.0-SNAPSHOT
+IMAGE=juplo/spring-consumer-json:1.0-SNAPSHOT
 
 if [ "$1" = "cleanup" ]
 then
-  docker-compose down -v
+  docker-compose -f docker/docker-compose.yml down -v --remove-orphans
   mvn clean
   exit
 fi
 
-docker-compose up -d zookeeper kafka-1 kafka-2 kafka-3 cli
-docker-compose rm -svf consumer
+docker-compose -f docker/docker-compose.yml up -d kafka-1 kafka-2 kafka-3 cli
+docker-compose -f docker/docker-compose.yml rm -svf consumer-1 consumer-2
 
 if [[
   $(docker image ls -q $IMAGE) == "" ||
@@ -23,18 +23,26 @@ 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
+docker-compose -f docker/docker-compose.yml up -d
+docker-compose -f docker/docker-compose.yml logs -f setup
 
 while ! [[ $(http 0:8080/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for producer..."; sleep 1; done
-sleep 5
-docker-compose exec cli kafkacat -b kafka-2:9092 -t test -q -c 10 -f'topic=%t\tpartition=%p\toffset=%o\tkey=%k\tvalue=%s\n'
-docker-compose exec cli kafkacat -b kafka-2:9092 -t test -q -c 10 -f'topic=%t\tpartition=%p\toffset=%o\tkey=%k\tvalue=%s\n'
-docker-compose exec cli kafkacat -b kafka-2:9092 -t test -q -c 10 -f'topic=%t\tpartition=%p\toffset=%o\tkey=%k\tvalue=%s\n'
-
-docker-compose stop peter klaus beate franz uschi consumer-1 consumer-2 consumer-3
-docker-compose logs consumer-1
-docker-compose logs consumer-2
-docker-compose logs consumer-3
+while ! [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-1..."; sleep 1; done
+while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-2..."; sleep 1; done
+
+# tag::nachrichten[]
+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[]
+
+docker-compose -f docker/docker-compose.yml logs -f consumer-1 consumer-2
+
+echo "Restarting consumer-1..."
+# tag::restart[]
+docker-compose -f docker/docker-compose.yml up consumer-1
+# end::restart[]