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

[demos/kafka/training] / README.sh

diff --git a/README.sh b/README.sh
index b7bce99..e772144 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-IMAGE=juplo/endless-consumer:1.0-SNAPSHOT
+IMAGE=juplo/sumup-adder:1.0-SNAPSHOT
 
 if [ "$1" = "cleanup" ]
 then
@@ -9,14 +9,17 @@ then
   exit
 fi
 
-docker-compose up -d zookeeper kafka cli mongo express
+docker-compose stop adder
+docker-compose rm -svf mongo
+docker-compose up -d zookeeper kafka-1 kafka-2 kafka-3 cli mongo express
 
 if [[
   $(docker image ls -q $IMAGE) == "" ||
   "$1" = "build"
 ]]
 then
-  mvn install || exit
+  docker-compose rm -svf adder
+  mvn -D skipTests clean install || exit
 else
   echo "Using image existing images:"
   docker image ls $IMAGE
@@ -25,16 +28,23 @@ 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 producer peter beate
+docker-compose up -d gateway requests adder
 
-sleep 15
+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..."; sleep 1; done
+while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder..."; sleep 1; done
 
-http -v post :8082/stop
-sleep 10
-docker-compose kill -s 9 peter
-http -v post :8082/start
-sleep 60
+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 stop producer peter beate
-docker-compose logs beate
-docker-compose logs --tail=10 peter
+docker-compose up -d adder
+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