X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=02ea5b1bb8e0d0cd5320bb99989e0d999f7ec914;hb=be0abebdf6a064d9151b710242676da47259e614;hp=e96245aa3a6c76b7ba8876b2a9593e5c943508eb;hpb=2ac1e5fcecbee7173fbd9f50e3373c6d0b25a478;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index e96245a..02ea5b1 100755
--- a/README.sh
+++ b/README.sh
@@ -4,20 +4,19 @@ IMAGE=juplo/supersimple-consumer: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 rm -svf consumer
-docker-compose up -d zookeeper 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) == "" ||
   "$1" = "build"
 ]]
 then
-  docker-compose rm -svf consumer
   mvn clean install || exit
 else
   echo "Using image existing images:"
@@ -25,16 +24,10 @@ else
 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 gateway requests-1 requests-2 consumer
+docker-compose -f docker/docker-compose.yml run --rm cli cub kafka-ready -b kafka:9092 3 60 > /dev/null 2>&1 || exit 1
 
-while ! [[ $(http 0:8080/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for gateway..."; sleep 1; done
-while ! [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for requests-1..."; sleep 1; done
-while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for requests-2..."; sleep 1; done
+docker-compose -f docker/docker-compose.yml up -t0 -d cli
 
-echo 6 | http -v :8080/peter
-
-sleep 10
-
-docker-compose logs consumer
+docker-compose -f docker/docker-compose.yml up -d producer consumer
+sleep 5
+docker-compose -f docker/docker-compose.yml logs consumer