Übung an die Docker-Übung angepasst

[demos/kafka/training] / README.sh

diff --git a/README.sh b/README.sh
index 6030770..b7cd7bc 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 
-IMAGE=juplo/simple-consumer:1.0-SNAPSHOT
+IMAGE=juplo/spring-consumer-kafkalistener: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 kafka-0 kafka-1 kafka-2 kafka-3 cli
-docker-compose rm -svf consumer-1
+docker-compose -f docker/docker-compose.yml up -d kafka-1 kafka-2 kafka-3
+docker-compose -f docker/docker-compose.yml rm -svf consumer
 
 if [[
   $(docker image ls -q $IMAGE) == "" ||
@@ -24,20 +24,10 @@ else
 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 consumer-1
+docker-compose -f docker/docker-compose.yml run --rm cli cub kafka-ready -b kafka:9092 3 60 > /dev/null 2>&1 || exit 1
 
-sleep 5
-
-docker-compose restart consumer-1
+docker-compose -f docker/docker-compose.yml up -t0 -d cli
 
+docker-compose -f docker/docker-compose.yml up -d producer consumer
 sleep 5
-
-docker-compose stop consumer-1 producer
-docker-compose logs consumer-1
-
-echo "Received messages for test/0"
-docker-compose logs consumer-1 | grep test/0
-echo "Received messages for test/1"
-docker-compose logs consumer-1 | grep test/1
+docker-compose -f docker/docker-compose.yml logs consumer