X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=2bb7508b282edd1c5830d7e159fbc0fd908bf9e5;hb=0cbb66ac7826c9e7f05b3ce16d470814aae24392;hp=b1ba0be493e6efe4d6d6a1ed7830f823262e2450;hpb=4c4eaa9bf0d40ca631ac78d3a51c36cfcda4fe6f;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index b1ba0be..2bb7508 100755
--- a/README.sh
+++ b/README.sh
@@ -1,36 +1,33 @@
 #!/bin/bash
 
-IMAGE=juplo/simple-consumer:1.0-SNAPSHOT
+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
 
-docker-compose up -d zookeeper 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
 
 if [[
   $(docker image ls -q $IMAGE) == "" ||
   "$1" = "build"
 ]]
 then
-  mvn install || exit
+  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
-sleep 5
+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 exec cli kafkacat -b kafka:9092 -t test -q -c 20 -f'topic=%t\tpartition=%p\toffset=%o\tkey=%k\tvalue=%s\n'
+docker-compose -f docker/docker-compose.yml up -t0 -d cli
 
-docker-compose stop producer consumer-1 consumer-2 consumer-3
-docker-compose logs consumer-1
-docker-compose logs consumer-2
-docker-compose logs consumer-3
+docker-compose -f docker/docker-compose.yml up -d producer consumer
+sleep 5
+docker-compose -f docker/docker-compose.yml logs consumer