X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=a97d6875b09c8fb638cb1d19c1c7fac4814933b5;hb=3bacb18a867586346d99a6827f557d422085a0bf;hp=f5bd509a8a119770e08e998a5283f69f64d66d4c;hpb=2a3eb5b1310b356b972056cf208491f6b59e3def;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index f5bd509..a97d687 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 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
-  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