From f37095d15c7726f5bbf1a8601a28e27285175769 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Wed, 25 Sep 2024 18:33:44 +0200
Subject: [PATCH] =?utf8?q?Setup=20an=20aktuellen=20Stand=20der=20Vorg?=
 =?utf8?q?=C3=A4nger=20angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 README.sh                                       | 14 +++++++-------
 docker-compose.yml => docker/docker-compose.yml |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename docker-compose.yml => docker/docker-compose.yml (93%)

diff --git a/README.sh b/README.sh
index 93a5eda..627ebb1 100755
--- a/README.sh
+++ b/README.sh
@@ -4,12 +4,12 @@ IMAGE=juplo/spring-endless-stream-producer:1.0-SNAPSHOT
 
 if [ "$1" = "cleanup" ]
 then
-  docker-compose down -v
+  docker compose -f docker/docker-compose.yml down -v
   mvn clean
   exit
 fi
 
-docker-compose up -d zookeeper kafka cli
+docker compose -f docker/docker-compose.yml up -d zookeeper kafka cli
 
 if [[
   $(docker image ls -q $IMAGE) == "" ||
@@ -23,9 +23,9 @@ 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
+docker compose -f docker/docker-compose.yml exec cli cub kafka-ready -b kafka:9092 1 60 > /dev/null 2>&1 || exit 1
+docker compose -f docker/docker-compose.yml up setup
+docker compose -f docker/docker-compose.yml up -d producer
 sleep 5
-docker-compose stop producer
-docker-compose logs producer
+docker compose -f docker/docker-compose.yml stop producer
+docker compose -f docker/docker-compose.yml logs producer
diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 93%
rename from docker-compose.yml
rename to docker/docker-compose.yml
index 59a8968..f34c07b 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,14 +1,14 @@
 version: '3.2'
 services:
   zookeeper:
-    image: confluentinc/cp-zookeeper:7.1.3
+    image: confluentinc/cp-zookeeper:7.7.1
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
     ports:
       - 2181:2181
 
   kafka:
-    image: confluentinc/cp-kafka:7.1.3
+    image: confluentinc/cp-kafka:7.7.1
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-- 
2.20.1