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

diff --git a/README.sh b/README.sh
index 44e2ecf..feaa66a 100755
--- a/README.sh
+++ b/README.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-IMAGE=juplo/simple-consumer:1.0-SNAPSHOT
+IMAGE=juplo/spring-consumer-json:1.0-SNAPSHOT
 
 if [ "$1" = "cleanup" ]
 then
@@ -9,32 +9,35 @@ then
   exit
 fi
 
-docker-compose up -d zookeeper kafka-1 kafka-2 kafka-3 cli
-docker-compose rm -svf consumer
+trap 'kill $(jobs -p) 2>/dev/null' EXIT
+
+docker-compose up -d kafka-0 kafka-1 kafka-2 kafka-3 cli
 
 if [[
   $(docker image ls -q $IMAGE) == "" ||
   "$1" = "build"
 ]]
 then
+  docker-compose rm -svf consumer-1 consumer-2
   mvn clean install || exit
 else
   echo "Using image existing images:"
   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 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
-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'
+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
+
+echo 6  | http -v :8080/peter
+echo 77 | http -v :8080/klaus
+echo 66 | http -v :8080/peter
+echo 7  | http -v :8080/klaus
+
+docker-compose stop consumer-1 consumer-2
 
-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