Verbesserungen an Setup/Vorführskript aus intro/docker übernommen

diff --git a/README.sh b/README.sh
index a85ad39..83650db 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -4,7 +4,7 @@ IMAGE=juplo/simple-consumer:1.0-SNAPSHOT
 
 if [ "$1" = "cleanup" ]
 then
-  docker-compose down -v
+  docker-compose down -v --remove-orphans
   mvn clean
   exit
 fi
@@ -27,10 +27,10 @@ fi
 docker-compose up setup
 docker-compose up -d producer
 
-mvn spring-boot:run &
-sleep 10
+java -jar target/simple-consumer-1.0-SNAPSHOT.jar &
+sleep 5
 kill $(jobs -p)
-mvn spring-boot:run &
-sleep 10
+java -jar target/simple-consumer-1.0-SNAPSHOT.jar &
+sleep 5
 docker-compose stop producer
 kill $(jobs -p)

diff --git a/docker-compose.yml b/docker-compose.yml
index bd15793..a100750 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -101,6 +101,10 @@ services:
   cli:
     image: juplo/toolbox
     command: sleep infinity
+    depends_on:
+      - kafka-1
+      - kafka-2
+      - kafka-3
 
   producer:
     image: juplo/simple-producer:1.0-SNAPSHOT