Compose-Setup und Vorführ-Skript an die Übung angepasst

[demos/kafka/training] / README.sh

diff --git a/README.sh b/README.sh
index 05178a3..e772144 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -9,6 +9,8 @@ then
   exit
 fi
 
+docker-compose stop adder
+docker-compose rm -svf mongo
 docker-compose up -d zookeeper kafka-1 kafka-2 kafka-3 cli mongo express
 
 if [[
@@ -17,7 +19,7 @@ if [[
 ]]
 then
   docker-compose rm -svf adder
-  mvn clean install || exit
+  mvn -D skipTests clean install || exit
 else
   echo "Using image existing images:"
   docker image ls $IMAGE
@@ -32,15 +34,17 @@ while ! [[ $(http 0:8080/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Wait
 while ! [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for requests..."; sleep 1; done
 while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder..."; sleep 1; done
 
-docker-compose up -d peter ute franz beate klaus uschi
+docker-compose up -d peter
 
+while [[ "$(http :8082/results | jq -r .)" == "{}" ]]; do echo "Waiting for some results to show up..."; done
 http -v :8082/results
 sleep 3
 http -v :8082/results
-
+http :8082/results/peter | jq .[].sum | uniq
 docker-compose kill -s 9 adder
 
 docker-compose up -d adder
-sleep 3
-docker-compose kill -s 9 peter ute franz beate klaus uschi
-http -v :8082/results
+docker-compose kill -s 9 peter
+while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder..."; sleep 1; done
+while [[ "$(http :8082/results | jq -r .)" == "{}" ]]; do echo "Waiting for some results to show up..."; sleep 1; done
+http :8082/results/peter | jq .[].sum | uniq