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

diff --git a/README.sh b/README.sh
index d0a59bd..29e7b60 100755
--- a/README.sh
+++ b/README.sh
@@ -4,63 +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-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 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 producer-0 producer-1
-while ! [[ $(http -b :8000/actuator/health | jq -r .status) =~ "UP" ]]; do echo Waiting for producer-0; sleep 1; done
-while ! [[ $(http -b :8001/actuator/health | jq -r .status) =~ "UP" ]]; do echo Waiting for producer-1; sleep 1; done
-docker-compose up -d consumer
+docker-compose -f docker/docker-compose.yml up --remove-orphans setup || exit 1
 
-echo foo | http -v :8000/foo
-echo foo | http -v :8001/foo
-echo foo | http -v :8001/foo
-echo foo | http -v :8000/bar
-echo foobar | http -v :8000/bar
-echo foofoo | http -v :8000/bar
-echo barbar | http -v :8000/bar
-echo barfoo | http -v :8000/bar
-echo bar | http -v :8000/bar
+docker-compose -f docker/docker-compose.yml up -t0 -d cli
+sleep 1
+docker-compose -f docker/docker-compose.yml logs setup
 
-docker-compose logs consumer
+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 up -d
-docker-compose exec cli kafkacat -C -b kafka:9092 -t test -o 0 -f'p=%p|o=%o|k=%k|v=%s\n' -q -c20
-
-docker-compose exec -T cli bash << 'EOF'
-echo "Altering number of partitions from 3 to 7..."
-kafka-topics --bootstrap-server kafka:9092 --describe --topic test
-kafka-topics --bootstrap-server kafka:9092 --describe --topic test
-kafka-topics --bootstrap-server kafka:9092 --alter --topic test --partitions 7
-kafka-topics --bootstrap-server kafka:9092 --describe --topic test
-EOF
-
-docker-compose restart producer-0 producer-1
-while ! [[ $(http -b :8000/actuator/health | jq -r .status) =~ "UP" ]]; do echo Waiting for :8000/actuator/health; sleep 1; done
-while ! [[ $(http -b :8001/actuator/health | jq -r .status) =~ "UP" ]]; do echo Waiting for :8001/actuator/health; sleep 1; done
-docker-compose exec cli kafkacat -C -b kafka:9092 -t test -o 0 -f'p=%p|o=%o|k=%k|v=%s\n' -q -c20
-
-echo "Messages from peter"
-docker-compose logs consumer | grep k=peter
-echo "Messages from beate"
-docker-compose logs consumer | grep k=beate
-echo "Messages from foo"
-docker-compose logs consumer | grep k=foo
+# tag::http[]
+echo -n bar | http -v :8080/foo
+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[]
+kafkacat -b :9092 -t test -f "%p|%o|%k=%s|%h\n" -e
+# end::kafkacat[]