X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=29e7b60906ebc7b0f8902c9c9ce4a1c1013bcfb9;hb=refs%2Fheads%2Fproducer%2Frest-producer--headers;hp=4f7f0174b3017808dfa613ec453e81c42601adfc;hpb=b253a681b64549837f665c65a8383334d4a99c59;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index 4f7f017..29e7b60 100755
--- a/README.sh
+++ b/README.sh
@@ -4,34 +4,40 @@ IMAGE=juplo/rest-producer: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
+  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
+docker-compose -f docker/docker-compose.yml up --remove-orphans setup || 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
 
 # tag::http[]
 echo -n bar | http -v :8080/foo
-echo -n foo | http -v :8080/bar X-id:666
+echo -n foo | http -v :8080/bar X-id:6
+echo -n foo | http -v :8000/bar X-id:66
+echo -n foo | http -v :8001/bar X-id:666
 # end::http[]
 # tag::kafkacat[]
-docker-compose exec cli kafkacat -b kafka:9092 -t test -f "%p|%o|%k=%s|%h\n" -e
+kafkacat -b :9092 -t test -f "%p|%o|%k=%s|%h\n" -e
 # end::kafkacat[]