X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=b7cd7bc076bcb1a0528eebeef0817fe7aefb64c9;hb=3b67d94458ef88503cd5b87c640e3c67f25bde2d;hp=c0a65f0eeb1166156635259a8e13b4b751bade7e;hpb=17b25ab1fb29e6445a25dbc604f261322bdda0ec;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index c0a65f0..b7cd7bc 100755
--- a/README.sh
+++ b/README.sh
@@ -4,14 +4,13 @@ IMAGE=juplo/spring-consumer-kafkalistener: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 kafka-1 kafka-2 kafka-3
+docker-compose -f docker/docker-compose.yml rm -svf consumer
 
 if [[
   $(docker image ls -q $IMAGE) == "" ||
@@ -24,7 +23,11 @@ else
   docker image ls $IMAGE
 fi
 
-docker-compose up setup
-docker-compose up -d consumer
-docker-compose up producer
-docker-compose logs consumer
+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
+sleep 5
+docker-compose -f docker/docker-compose.yml logs consumer