X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=7bcc99623271839aa1cf83ecc0dbaf5230a1db81;hb=0a23b208086aa3617f75d48e4e1b286cfdf9e64d;hp=feaa66a02e7228f16c8e1a782dcd8722444c27d1;hpb=fbd2fe7121eea8ce0c25d53dcb80b2565ccc8598;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index feaa66a..7bcc996 100755
--- a/README.sh
+++ b/README.sh
@@ -1,32 +1,34 @@
 #!/bin/bash
 
-IMAGE=juplo/spring-consumer-json: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 -t0 -v --remove-orphans
   mvn clean
   exit
 fi
 
-trap 'kill $(jobs -p) 2>/dev/null' EXIT
-
-docker-compose up -d kafka-0 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 [[
   $(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
 
-docker-compose up setup
-docker-compose up -d producer consumer-1 consumer-2
+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
@@ -34,10 +36,11 @@ while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Wait
 
 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
+echo "Writing logic error..."
+echo 66 | http -v :8080/peter?error=1
+echo 7  | http -v :8080/klaus
 
-docker-compose logs consumer-1
-docker-compose logs consumer-2
+sleep 5
+docker-compose -f docker/docker-compose.yml stop consumer-1 consumer-2
+docker-compose -f docker/docker-compose.yml logs -f consumer-1 consumer-2