X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=f337d5ce9067fb3aa41202b29615333057aca40d;hb=refs%2Fheads%2Fsumup-adder--rebalance-listener--sticky-assignor;hp=c9494b9be839cd0c05bd726364483c9bcc16aff2;hpb=9fe70ad96d2b5a9ed0581057da54facba859ad1f;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index c9494b9..f01e872 100755
--- a/README.sh
+++ b/README.sh
@@ -4,21 +4,21 @@ IMAGE=juplo/sumup-adder:1.0-SNAPSHOT
 
 if [ "$1" = "cleanup" ]
 then
-  docker-compose down -v
+  docker compose down -v
   mvn clean
   exit
 fi
 
-docker-compose rm -svf adder-1 adder-2
-docker-compose rm -svf mongo
-docker-compose up -d zookeeper kafka-1 kafka-2 kafka-3 cli mongo express
+docker compose rm -svf adder-1 adder-2
+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
-  docker-compose rm -svf adder-1 adder-2
+  docker compose rm -svf adder-1 adder-2
   mvn -D skipTests clean install || exit
 else
   echo "Using image existing images:"
@@ -26,17 +26,17 @@ 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
+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
 
 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 up -d peter klaus
+docker compose up -d peter klaus
 
-docker-compose up -d adder-1
+docker compose up -d adder-1
 while ! [[ $(http 0:8091/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder-1..."; sleep 1; done
 while [[ "$(http :8091/results | jq -r .)" == "{}" ]]; do echo "Waiting for some results to show up on adder-1..."; sleep 1; done
 http -v --pretty none -S :8091/results
@@ -53,7 +53,7 @@ echo "Resultate für klaus von adder-1"
 http :8091/results/klaus | jq .[].sum | uniq
 
 
-docker-compose up -d adder-2
+docker compose up -d adder-2
 while ! [[ $(http 0:8092/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder-2..."; sleep 1; done
 while [[ "$(http :8092/results | jq -r .)" == "{}" ]]; do echo "Waiting for some results to show up on adder-2..."; sleep 1; done
 http -v --pretty none -S :8092/results
@@ -74,4 +74,17 @@ http :8092/results/peter | jq .[].sum | uniq
 echo "Resultate für klaus von adder-2"
 http :8092/results/klaus | jq .[].sum | uniq
 
-docker-compose kill -s 9 peter klaus
+docker compose stop adder-1
+until [ $(http --check-status :8092/results/peter 2> /dev/null) ]; do echo "Waiting for some results for peter to show up on adder-2..."; sleep 1; done
+until [ $(http --check-status :8092/results/klaus 2> /dev/null) ]; do echo "Waiting for some results for peter to show up on adder-2..."; sleep 1; done
+
+echo "Resultate für adder-2"
+http -v --pretty none -S :8092/results
+echo
+
+echo "Resultate für peter von adder-2"
+http :8092/results/peter | jq .[].sum | uniq
+echo "Resultate für klaus von adder-2"
+http :8092/results/klaus | jq .[].sum | uniq
+
+docker compose kill -s 9 peter klaus