From 77f3fbcdd2cb4dbb023414f56c6ffdb64e66d999 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Sun, 11 Jun 2023 09:40:54 +0200 Subject: [PATCH] Docker-Setup in das Unterverzeichnis `docker` verschoben --- README.sh | 14 +++++++------- docker-compose.yml => docker/docker-compose.yml | 0 2 files changed, 7 insertions(+), 7 deletions(-) rename docker-compose.yml => docker/docker-compose.yml (100%) diff --git a/README.sh b/README.sh index e61188f..985d1df 100755 --- a/README.sh +++ b/README.sh @@ -4,13 +4,13 @@ IMAGE=juplo/spring-consumer-json:1.0-SNAPSHOT if [ "$1" = "cleanup" ] then - docker-compose down -v --remove-orphans + docker-compose -f docker/docker-compose.yml down -v --remove-orphans mvn clean exit fi -docker-compose up -d kafka-1 kafka-2 kafka-3 cli -docker-compose rm -svf consumer-1 consumer-2 +docker-compose -f docker/docker-compose.yml up -d kafka-1 kafka-2 kafka-3 cli +docker-compose -f docker/docker-compose.yml rm -svf consumer-1 consumer-2 if [[ $(docker image ls -q $IMAGE) == "" || @@ -23,8 +23,8 @@ else docker image ls $IMAGE fi -docker-compose up -d -docker-compose logs -f setup +docker-compose -f docker/docker-compose.yml up -d +docker-compose -f docker/docker-compose.yml logs -f setup while ! [[ $(http 0:8080/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for producer..."; sleep 1; done while ! [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for consumer-1..."; sleep 1; done @@ -40,9 +40,9 @@ echo "Writing poison pill..." echo 'BOOM!' | kafkacat -P -b :9092 -t test # end::poisonpill[] -docker-compose logs -f consumer-1 consumer-2 +docker-compose -f docker/docker-compose.yml logs -f consumer-1 consumer-2 echo "Restarting consumer-1..." # tag::restart[] -docker-compose up consumer-1 +docker-compose -f docker/docker-compose.yml up consumer-1 # end::restart[] diff --git a/docker-compose.yml b/docker/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to docker/docker-compose.yml -- 2.20.1