X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=2bb7508b282edd1c5830d7e159fbc0fd908bf9e5;hb=refs%2Ftags%2Fspring%2Fspring-consumer--kafkalistener---2023-06-signal;hp=a85ad3991cd46b7d74b3080398d8106d92ac5ae8;hpb=797aae9c1e2e9a6795d529780dc5dfd3fb28ea5f;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index a85ad39..2bb7508 100755
--- a/README.sh
+++ b/README.sh
@@ -1,17 +1,16 @@
 #!/bin/bash
 
-IMAGE=juplo/simple-consumer:1.0-SNAPSHOT
+IMAGE=juplo/spring-consumer-kafkalistener: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,11 @@ else
   docker image ls $IMAGE
 fi
 
-docker-compose up setup
-docker-compose up -d producer
+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
 
-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 up -d producer consumer
+sleep 5
+docker-compose -f docker/docker-compose.yml logs consumer