X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=427eca3a4ea8ddc96ea6d955c5b6d57c40b8124c;hb=f6dcfd71139594d296b36270e8dbf91fda2b2cbf;hp=76ed9c3c85a5d9e72881055d5ff1cc9b01fe0ac2;hpb=061fcde1c8d74912149dfbbd7b19d311d9f29718;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index 76ed9c3..427eca3 100755
--- a/README.sh
+++ b/README.sh
@@ -1,64 +1,41 @@
 #!/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 --remove-orphans
+  docker-compose -f docker/docker-compose.yml down -t0 -v --remove-orphans
   mvn clean
   exit
 fi
 
-docker-compose up -d kafka-1 kafka-2 kafka-3 cli
-docker-compose rm -svf producer producer-0 producer-1
+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
+  docker-compose rm -svf producer
   mvn clean install || exit
 else
   echo "Using image existing images:"
   docker image ls $IMAGE
 fi
 
-docker-compose up setup
-docker-compose up -d producer-0 producer-1
-while ! [[ $(http 0:8000/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for producer-0..."; sleep 1; done
-while ! [[ $(http 0:8001/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for producer-1..."; sleep 1; done
-docker-compose up -d consumer
+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
 
-# tag::http[]
-echo -n Nachricht 1 an Producer 0 | http -v :8000/foo
-echo -n Nachricht 1 an Producer 1 | http -v :8001/foo
-# end::http[]
-echo -n Nachricht 2 an Producer 0 | http -v :8000/bar
-echo -n Nachricht 2 an Producer 1 | http -v :8001/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 exec -T cli bash << 'EOF'
-echo "Altering number of partitions from 3 to 7..."
-kafka-topics --bootstrap-server kafka:9092 --describe --topic test
-# tag::repartitioning[]
-kafka-topics --bootstrap-server kafka:9092 --alter --topic test --partitions 7
-# end::repartitioning[]
-kafka-topics --bootstrap-server kafka:9092 --describe --topic test
-EOF
-
-docker-compose restart producer-0 producer-1
-while ! [[ $(http 0:8000/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for producer-0..."; sleep 1; done
-while ! [[ $(http 0:8001/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for producer-1..."; sleep 1; done
-
-echo -n Nachricht 3 an Producer 0 | http -v :8000/foo
-echo -n Nachricht 3 an Producer 1 | http -v :8001/foo
-echo -n Nachricht 4 an Producer 0 | http -v :8000/bar
-echo -n Nachricht 4 an Producer 1 | http -v :8001/bar
-
-docker-compose logs consumer
+echo -n 3 | http -v :8080/foo;
 
 # tag::kafkacat[]
-kafkacat -b :9092 -t test -o 0 -p0 -f'p=%p|o=%o|k=%k|v=%s\n' -qe
-kafkacat -b :9092 -t test -o 0 -p1 -f'p=%p|o=%o|k=%k|v=%s\n' -qe
+kafkacat -b :9092 -t test -o 0 -e -f 'p=%p|o=%o|k=%k|h=%h|v=%s\n'
 # end::kafkacat[]