Setup für Grundlagen-Übungen vereinfacht

[demos/kafka/training] / README.sh

diff --git a/README.sh b/README.sh
index 8915acf..008213c 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -4,36 +4,41 @@ IMAGE=juplo/simple-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
+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
 
 if [[
   $(docker image ls -q $IMAGE) == "" ||
   "$1" = "build"
 ]]
 then
-  mvn install || exit
+  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 cli cub kafka-ready -b kafka:9092 1 60 > /dev/null 2>&1 || exit 1
-docker-compose up setup
-docker-compose up -d
+docker-compose -f docker/docker-compose.yml up --remove-orphans setup || exit 1
+
+docker-compose -f docker/docker-compose.yml up -t0 -d cli
+sleep 1
+docker-compose -f docker/docker-compose.yml logs setup
+
+docker-compose -f docker/docker-compose.yml ps
+
+docker-compose -f docker/docker-compose.yml up -d producer
+docker-compose -f docker/docker-compose.yml up -d consumer
 
-while ! [[ $(http 0:8080/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for producer..."; sleep 1; done
 sleep 5
-docker-compose exec cli kafkacat -b kafka-2:9092 -t test -q -c 10 -f'topic=%t\tpartition=%p\toffset=%o\tkey=%k\tvalue=%s\n'
-docker-compose exec cli kafkacat -b kafka-2:9092 -t test -q -c 10 -f'topic=%t\tpartition=%p\toffset=%o\tkey=%k\tvalue=%s\n'
-docker-compose exec cli kafkacat -b kafka-2:9092 -t test -q -c 10 -f'topic=%t\tpartition=%p\toffset=%o\tkey=%k\tvalue=%s\n'
-
-docker-compose stop peter klaus beate franz uschi consumer-1 consumer-2 consumer-3
-docker-compose logs consumer-1
-docker-compose logs consumer-2
-docker-compose logs consumer-3
+docker-compose -f docker/docker-compose.yml stop consumer
+
+docker-compose -f docker/docker-compose.yml start consumer
+sleep 5
+
+docker-compose -f docker/docker-compose.yml stop producer consumer
+docker-compose -f docker/docker-compose.yml logs consumer