Docker-Setup in das Unterverzeichnis `docker` verschoben

diff --git a/README.sh b/README.sh
index e61188f..985d1df 100755 (executable)
--- 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-compose.yml
deleted file mode 100644 (file)
index 7324b30..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,156 +0,0 @@
-version: '3.2'
-services:
-  kafka-0:
-    image: bitnami/kafka:3.3.1
-    environment:
-      KAFKA_ENABLE_KRAFT: 'yes'
-      KAFKA_KRAFT_CLUSTER_ID: r7dMBY60T16TrNCGeXniLw
-      KAFKA_CFG_PROCESS_ROLES: controller
-      KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
-      KAFKA_CFG_LISTENERS: CONTROLLER://:9092
-      KAFKA_CFG_ADVERTISED_LISTENERS: " "
-      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT
-      KAFKA_BROKER_ID: 0
-      KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@kafka-0:9092
-      ALLOW_PLAINTEXT_LISTENER: 'yes'
-      KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "false"
-
-  kafka-1:
-    image: bitnami/kafka:3.3.1
-    environment:
-      KAFKA_ENABLE_KRAFT: 'yes'
-      KAFKA_KRAFT_CLUSTER_ID: r7dMBY60T16TrNCGeXniLw
-      KAFKA_CFG_PROCESS_ROLES: broker
-      KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
-      KAFKA_CFG_LISTENERS: BROKER://:9092, LOCALHOST://:9081
-      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: BROKER:PLAINTEXT, CONTROLLER:PLAINTEXT, LOCALHOST:PLAINTEXT
-      KAFKA_CFG_ADVERTISED_LISTENERS: BROKER://kafka-1:9092, LOCALHOST://localhost:9081
-      KAFKA_BROKER_ID: 1
-      KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@kafka-0:9092
-      ALLOW_PLAINTEXT_LISTENER: 'yes'
-      KAFKA_CFG_INTER_BROKER_LISTENER_NAME: BROKER
-      KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 3
-      KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "false"
-    ports:
-      - 9081:9081
-    depends_on:
-      - kafka-0
-
-  kafka-2:
-    image: bitnami/kafka:3.3.1
-    environment:
-      KAFKA_ENABLE_KRAFT: 'yes'
-      KAFKA_KRAFT_CLUSTER_ID: r7dMBY60T16TrNCGeXniLw
-      KAFKA_CFG_PROCESS_ROLES: broker
-      KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
-      KAFKA_CFG_LISTENERS: BROKER://:9092, LOCALHOST://:9082
-      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: BROKER:PLAINTEXT, CONTROLLER:PLAINTEXT, LOCALHOST:PLAINTEXT
-      KAFKA_CFG_ADVERTISED_LISTENERS: BROKER://kafka-2:9092, LOCALHOST://localhost:9082
-      KAFKA_BROKER_ID: 2
-      KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@kafka-0:9092
-      ALLOW_PLAINTEXT_LISTENER: 'yes'
-      KAFKA_CFG_INTER_BROKER_LISTENER_NAME: BROKER
-      KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 3
-      KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "false"
-    ports:
-      - 9092:9082
-      - 9082:9082
-    networks:
-      default:
-        aliases:
-          - kafka
-    depends_on:
-      - kafka-0
-
-  kafka-3:
-    image: bitnami/kafka:3.3.1
-    environment:
-      KAFKA_ENABLE_KRAFT: 'yes'
-      KAFKA_KRAFT_CLUSTER_ID: r7dMBY60T16TrNCGeXniLw
-      KAFKA_CFG_PROCESS_ROLES: broker
-      KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
-      KAFKA_CFG_LISTENERS: BROKER://:9092, LOCALHOST://:9083
-      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: BROKER:PLAINTEXT, CONTROLLER:PLAINTEXT, LOCALHOST:PLAINTEXT
-      KAFKA_CFG_ADVERTISED_LISTENERS: BROKER://kafka-3:9092, LOCALHOST://localhost:9083
-      KAFKA_BROKER_ID: 3
-      KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@kafka-0:9092
-      ALLOW_PLAINTEXT_LISTENER: 'yes'
-      KAFKA_CFG_INTER_BROKER_LISTENER_NAME: BROKER
-      KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 3
-      KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "false"
-    ports:
-      - 9083:9083
-    depends_on:
-      - kafka-0
-
-
-  setup:
-    image: juplo/toolbox
-    command: >
-      bash -c "
-        kafka-topics --bootstrap-server kafka:9092 --delete --if-exists --topic test
-        kafka-topics --bootstrap-server kafka:9092 --create --topic test --partitions 2 --replication-factor 3 --config min.insync.replicas=2
-        kafka-topics --bootstrap-server kafka:9092 --describe --topic test
-      "
-    depends_on:
-      - kafka-1
-      - kafka-2
-      - kafka-3
-      - cli
-
-  akhq:
-    image: tchiotludo/akhq:0.23.0
-    ports:
-      - 8000:8080
-    environment:
-      AKHQ_CONFIGURATION: |
-        akhq:
-          connections:
-            docker-kafka-server:
-              properties:
-                bootstrap.servers: "kafka:9092"
-    depends_on:
-      - kafka-1
-      - kafka-2
-      - kafka-3
-
-  cli:
-    image: juplo/toolbox
-    command: sleep infinity
-    depends_on:
-      - kafka-1
-      - kafka-2
-      - kafka-3
-
-  producer:
-    image: juplo/rest-producer-json:1.0-SNAPSHOT
-    ports:
-      - 8080:8080
-    environment:
-      server.port: 8080
-      producer.bootstrap-server: kafka:9092
-      producer.client-id: producer
-      producer.topic: test
-
-  consumer-1:
-    image: juplo/spring-consumer-json:1.0-SNAPSHOT
-    ports:
-      - 8081:8080
-    environment:
-      server.port: 8080
-      spring.kafka.bootstrap-servers: kafka:9092
-      spring.kafka.client-id: consumer-1
-      spring.kafka.consumer.group-id: my-group
-      simple.consumer.topic: test
-
-  consumer-2:
-    image: juplo/spring-consumer-json:1.0-SNAPSHOT
-    ports:
-      - 8082:8080
-    environment:
-      server.port: 8080
-      spring.kafka.bootstrap-servers: kafka:9092
-      spring.kafka.client-id: consumer-2
-      spring.kafka.consumer.group-id: my-group
-      simple.consumer.topic: test

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644 (file)
index 0000000..7324b30
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,156 @@
+version: '3.2'
+services:
+  kafka-0:
+    image: bitnami/kafka:3.3.1
+    environment:
+      KAFKA_ENABLE_KRAFT: 'yes'
+      KAFKA_KRAFT_CLUSTER_ID: r7dMBY60T16TrNCGeXniLw
+      KAFKA_CFG_PROCESS_ROLES: controller
+      KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      KAFKA_CFG_LISTENERS: CONTROLLER://:9092
+      KAFKA_CFG_ADVERTISED_LISTENERS: " "
+      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT
+      KAFKA_BROKER_ID: 0
+      KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@kafka-0:9092
+      ALLOW_PLAINTEXT_LISTENER: 'yes'
+      KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "false"
+
+  kafka-1:
+    image: bitnami/kafka:3.3.1
+    environment:
+      KAFKA_ENABLE_KRAFT: 'yes'
+      KAFKA_KRAFT_CLUSTER_ID: r7dMBY60T16TrNCGeXniLw
+      KAFKA_CFG_PROCESS_ROLES: broker
+      KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      KAFKA_CFG_LISTENERS: BROKER://:9092, LOCALHOST://:9081
+      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: BROKER:PLAINTEXT, CONTROLLER:PLAINTEXT, LOCALHOST:PLAINTEXT
+      KAFKA_CFG_ADVERTISED_LISTENERS: BROKER://kafka-1:9092, LOCALHOST://localhost:9081
+      KAFKA_BROKER_ID: 1
+      KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@kafka-0:9092
+      ALLOW_PLAINTEXT_LISTENER: 'yes'
+      KAFKA_CFG_INTER_BROKER_LISTENER_NAME: BROKER
+      KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 3
+      KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "false"
+    ports:
+      - 9081:9081
+    depends_on:
+      - kafka-0
+
+  kafka-2:
+    image: bitnami/kafka:3.3.1
+    environment:
+      KAFKA_ENABLE_KRAFT: 'yes'
+      KAFKA_KRAFT_CLUSTER_ID: r7dMBY60T16TrNCGeXniLw
+      KAFKA_CFG_PROCESS_ROLES: broker
+      KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      KAFKA_CFG_LISTENERS: BROKER://:9092, LOCALHOST://:9082
+      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: BROKER:PLAINTEXT, CONTROLLER:PLAINTEXT, LOCALHOST:PLAINTEXT
+      KAFKA_CFG_ADVERTISED_LISTENERS: BROKER://kafka-2:9092, LOCALHOST://localhost:9082
+      KAFKA_BROKER_ID: 2
+      KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@kafka-0:9092
+      ALLOW_PLAINTEXT_LISTENER: 'yes'
+      KAFKA_CFG_INTER_BROKER_LISTENER_NAME: BROKER
+      KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 3
+      KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "false"
+    ports:
+      - 9092:9082
+      - 9082:9082
+    networks:
+      default:
+        aliases:
+          - kafka
+    depends_on:
+      - kafka-0
+
+  kafka-3:
+    image: bitnami/kafka:3.3.1
+    environment:
+      KAFKA_ENABLE_KRAFT: 'yes'
+      KAFKA_KRAFT_CLUSTER_ID: r7dMBY60T16TrNCGeXniLw
+      KAFKA_CFG_PROCESS_ROLES: broker
+      KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      KAFKA_CFG_LISTENERS: BROKER://:9092, LOCALHOST://:9083
+      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: BROKER:PLAINTEXT, CONTROLLER:PLAINTEXT, LOCALHOST:PLAINTEXT
+      KAFKA_CFG_ADVERTISED_LISTENERS: BROKER://kafka-3:9092, LOCALHOST://localhost:9083
+      KAFKA_BROKER_ID: 3
+      KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@kafka-0:9092
+      ALLOW_PLAINTEXT_LISTENER: 'yes'
+      KAFKA_CFG_INTER_BROKER_LISTENER_NAME: BROKER
+      KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: 3
+      KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "false"
+    ports:
+      - 9083:9083
+    depends_on:
+      - kafka-0
+
+
+  setup:
+    image: juplo/toolbox
+    command: >
+      bash -c "
+        kafka-topics --bootstrap-server kafka:9092 --delete --if-exists --topic test
+        kafka-topics --bootstrap-server kafka:9092 --create --topic test --partitions 2 --replication-factor 3 --config min.insync.replicas=2
+        kafka-topics --bootstrap-server kafka:9092 --describe --topic test
+      "
+    depends_on:
+      - kafka-1
+      - kafka-2
+      - kafka-3
+      - cli
+
+  akhq:
+    image: tchiotludo/akhq:0.23.0
+    ports:
+      - 8000:8080
+    environment:
+      AKHQ_CONFIGURATION: |
+        akhq:
+          connections:
+            docker-kafka-server:
+              properties:
+                bootstrap.servers: "kafka:9092"
+    depends_on:
+      - kafka-1
+      - kafka-2
+      - kafka-3
+
+  cli:
+    image: juplo/toolbox
+    command: sleep infinity
+    depends_on:
+      - kafka-1
+      - kafka-2
+      - kafka-3
+
+  producer:
+    image: juplo/rest-producer-json:1.0-SNAPSHOT
+    ports:
+      - 8080:8080
+    environment:
+      server.port: 8080
+      producer.bootstrap-server: kafka:9092
+      producer.client-id: producer
+      producer.topic: test
+
+  consumer-1:
+    image: juplo/spring-consumer-json:1.0-SNAPSHOT
+    ports:
+      - 8081:8080
+    environment:
+      server.port: 8080
+      spring.kafka.bootstrap-servers: kafka:9092
+      spring.kafka.client-id: consumer-1
+      spring.kafka.consumer.group-id: my-group
+      simple.consumer.topic: test
+
+  consumer-2:
+    image: juplo/spring-consumer-json:1.0-SNAPSHOT
+    ports:
+      - 8082:8080
+    environment:
+      server.port: 8080
+      spring.kafka.bootstrap-servers: kafka:9092
+      spring.kafka.client-id: consumer-2
+      spring.kafka.consumer.group-id: my-group
+      simple.consumer.topic: test