Übung an die Docker-Übung angepasst

[demos/kafka/training] / README.sh

diff --git a/README.sh b/README.sh
index 05178a3..02ea5b1 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
-IMAGE=juplo/sumup-adder:1.0-SNAPSHOT
+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 up -d zookeeper kafka-1 kafka-2 kafka-3 cli mongo express
+docker-compose -f docker/docker-compose.yml up -d 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 adder
   mvn clean install || exit
 else
   echo "Using image existing images:"
@@ -24,23 +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 adder
+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..."; sleep 1; done
-while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder..."; sleep 1; done
+docker-compose -f docker/docker-compose.yml up -t0 -d cli
 
-docker-compose up -d peter ute franz beate klaus uschi
-
-http -v :8082/results
-sleep 3
-http -v :8082/results
-
-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 -f docker/docker-compose.yml up -d producer consumer
+sleep 5
+docker-compose -f docker/docker-compose.yml logs consumer