X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=af458b91ac7a1b6fb036df5d3725ce6402413fbe;hb=84419a8aef4eb56975c61a42a527da5f202e72fd;hp=c8aa4dc8510d4e5f806bfc72832f97386bdef982;hpb=b61195f531e312897ff2677a63601cb9b17b1bcb;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index c8aa4dc..af458b9 100755
--- a/README.sh
+++ b/README.sh
@@ -1,33 +1,44 @@
 #!/bin/bash
 
-IMAGE=juplo/rest-producer:1.0-SNAPSHOT
+IMAGE=juplo/rest-producer--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 zookeeper kafka 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 producer producer-0 producer-1
 
 if [[
   $(docker image ls -q $IMAGE) == "" ||
   "$1" = "build"
 ]]
 then
-  mvn install || exit
+  docker-compose rm -svf producer
+  mvn clean install || exit
 else
   echo "Using image existing images:"
   docker image ls $IMAGE
 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 -b :8080/actuator/health | jq -r .status) =~ "UP" ]]; do echo Waiting for :8080/actuator/health; sleep 1; done
-
-echo -n bar | http -v :8080/foo
-echo -n foo | http -v :8080/bar X-id:666
-docker-compose exec cli kafkacat -b kafka:9092 -t test -f "%p|%o|%k=%s|%h\n" -e
+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
+sleep 1
+docker-compose -f docker/docker-compose.yml logs setup
+
+docker-compose -f docker/docker-compose.yml up -d producer
+while ! [[ $(http 0:8080/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for producer..."; sleep 1; done
+
+docker-compose -f docker/docker-compose.yml up -d peter klaus
+
+sleep 10
+docker-compose -f docker/docker-compose.yml stop peter klaus
+
+# tag::kafkacat[]
+kafkacat -b :9092 -t test -o 0 -e -f 'p=%p|o=%o|k=%k|h=%h|v=%s\n'
+# end::kafkacat[]