X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=1394020a4f89cd9410fcd7e347c85d27d29314b1;hb=ea0b9e7cdc4a32e317b4de44bc53ec46ea03c39f;hp=2a1e5d864719f10d0875f18b14a11f97793b4493;hpb=6c1d4abdf0a96e3aef8452b3e2c10be14f378700;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index 2a1e5d8..1394020 100755
--- a/README.sh
+++ b/README.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-IMAGE=juplo/endless-consumer:1.0-SNAPSHOT
+IMAGE=juplo/spring-consumer:1.0-SNAPSHOT
 
 if [ "$1" = "cleanup" ]
 then
@@ -9,14 +9,16 @@ then
   exit
 fi
 
-docker-compose up -d zookeeper kafka cli
+trap 'kill $(jobs -p) 2>/dev/null' EXIT
+
+docker-compose up -d kafka-0 kafka-1 kafka-2 kafka-3 cli
 
 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
@@ -25,44 +27,12 @@ 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
-
-while ! [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-1..."; sleep 1; done
-while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-2..."; sleep 1; done
-while ! [[ $(http 0:8083/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-3..."; sleep 1; done
-while ! [[ $(http 0:8084/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-4..."; sleep 1; done
-while ! [[ $(http 0:8085/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-5..."; sleep 1; done
-
-sleep 5
-
-docker-compose exec -T cli bash << 'EOF'
-echo "Writing poison pill into topic test..."
-# tag::poisonpill[]
-echo 'BOOM!' | kafkacat -P -b kafka:9092 -t test
-# end::poisonpill[]
-EOF
-
-while [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "consumer-1 is still running..."; sleep 1; done
-while [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "consumer-2 is still running..."; sleep 1; done
-while [[ $(http 0:8083/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "consumer-3 is still running..."; sleep 1; done
-while [[ $(http 0:8084/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "consumer-4 is still running..."; sleep 1; done
-while [[ $(http 0:8085/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "consumer-5 is still running..."; sleep 1; done
-
-http -v :8081/actuator/health
-echo "Restarting consumer-1"
-http -v post :8081/start
-
-echo "Waiting for consumer-1 to come up"
-while ! [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-1..."; sleep 1; done
-http -v :8081/actuator/health
-
-echo "Waiting for consumer-1 to crash"
-while [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "consumer-1 is still running..."; sleep 1; done
-http -v :8081/actuator/health
+docker-compose up -d producer
 
+mvn spring-boot:run &
+sleep 10
+kill $(jobs -p)
+mvn spring-boot:run &
+sleep 10
 docker-compose stop producer
-docker-compose logs --tail=10 consumer-1
-docker-compose logs --tail=10 consumer-2
-docker-compose logs --tail=10 consumer-3
-docker-compose logs --tail=10 consumer-4
-docker-compose logs --tail=10 consumer-5
+kill $(jobs -p)