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

diff --git a/README.sh b/README.sh
index 95aae0b..7bcc996 100755
--- a/README.sh
+++ b/README.sh
@@ -1,33 +1,46 @@
 #!/bin/bash
 
+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
 
-mvn package || exit 1
-if [ "$1" = "build" ]; then exit; fi
-
-trap 'kill $(jobs -p) 2>/dev/null' EXIT
+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
 
-docker-compose up -d
+if [[
+  $(docker image ls -q $IMAGE) == "" ||
+  "$1" = "build"
+]]
+then
+  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 kafka cub kafka-ready -b kafka:9092 1 60 > /dev/null 2>&1 || exit 1
-
-echo "Producing messages"
-mvn exec:java@producer
-
-echo "Reading messages"
-mvn exec:java@consumer &
-sleep 7
-kill $(jobs -p)
-sleep 2
-
-echo "Re-Reading messages"
-mvn exec:java@consumer &
-sleep 7
-kill $(jobs -p)
-sleep 2
+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
+while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-2..."; sleep 1; done
+
+echo 6  | http -v :8080/peter
+echo 77 | http -v :8080/klaus
+
+echo "Writing logic error..."
+echo 66 | http -v :8080/peter?error=1
+echo 7  | http -v :8080/klaus
+
+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