Setup für Grundlagen-Übungen vereinfacht

[demos/kafka/training] / README.sh

diff --git a/README.sh b/README.sh
index a85ad39..008213c 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -4,14 +4,13 @@ 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
 
-trap 'kill $(jobs -p) 2>/dev/null' EXIT
-
-docker-compose up -d kafka-0 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) == "" ||
@@ -24,13 +23,22 @@ else
   docker image ls $IMAGE
 fi
 
-docker-compose up setup
-docker-compose up -d producer
+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
+
+sleep 5
+docker-compose -f docker/docker-compose.yml stop consumer
+
+docker-compose -f docker/docker-compose.yml start consumer
+sleep 5
 
-mvn spring-boot:run &
-sleep 10
-kill $(jobs -p)
-mvn spring-boot:run &
-sleep 10
-docker-compose stop producer
-kill $(jobs -p)
+docker-compose -f docker/docker-compose.yml stop producer consumer
+docker-compose -f docker/docker-compose.yml logs consumer