Aktualisierung auf Java 17

[demos/kafka/training] / README.sh

diff --git a/README.sh b/README.sh
index c2ea029..a5a4774 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -1,30 +1,34 @@
 #!/bin/bash
 
-IMAGE=juplo/spring-consumer-json:1.0-SNAPSHOT
+IMAGE=juplo/spring-consumer--json: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 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-1 consumer-2
 
 if [[
   $(docker image ls -q $IMAGE) == "" ||
   "$1" = "build"
 ]]
 then
-  docker-compose rm -svf consumer-1 consumer-2
   mvn clean install || exit
 else
   echo "Using image existing images:"
   docker image ls $IMAGE
 fi
 
-docker-compose up -d
-docker-compose logs -f setup
+echo "Waiting for the Kafka-Cluster to become ready..."
+docker-compose -f docker/docker-compose.yml run --rm cli cub kafka-ready -b kafka:9092 3 60 > /dev/null 2>&1 || exit 1
+
+docker-compose -f docker/docker-compose.yml up -t0 -d cli
+
+docker-compose -f docker/docker-compose.yml up -d producer consumer-1 consumer-2
 
 while ! [[ $(http 0:8080/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for producer..."; sleep 1; done
 while ! [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-1..."; sleep 1; done
@@ -40,9 +44,9 @@ echo "Writing poison pill..."
 echo 'BOOM!' | kafkacat -P -b :9092 -t test
 # end::poisonpill[]
 
-docker-compose logs -f consumer-1 consumer-2
+docker-compose -f docker/docker-compose.yml logs -f consumer-1 consumer-2
 
 echo "Restarting consumer-1..."
 # tag::restart[]
-docker-compose up consumer-1
+docker-compose -f docker/docker-compose.yml up consumer-1
 # end::restart[]