From e1c892baa390dc7d4f13adaf6a77ae264b751a91 Mon Sep 17 00:00:00 2001
From: Diego Rubio <dbiosag@gmail.com>
Date: Thu, 26 Nov 2020 19:18:08 +0100
Subject: [PATCH] Change in docker compose to deploy all containers

---
 .../configuration/KafkaTopicConfig.java       | 19 ----------
 .../src/main/resources/application.yml        |  5 +--
 demo-query/src/main/resources/application.yml |  7 ++--
 docker-compose.yml                            | 35 +++++++++++++++----
 4 files changed, 35 insertions(+), 31 deletions(-)
 delete mode 100644 demo-command/src/main/java/es/dbiosag/command/infrasturcture/configuration/KafkaTopicConfig.java

diff --git a/demo-command/src/main/java/es/dbiosag/command/infrasturcture/configuration/KafkaTopicConfig.java b/demo-command/src/main/java/es/dbiosag/command/infrasturcture/configuration/KafkaTopicConfig.java
deleted file mode 100644
index d548c2f..0000000
--- a/demo-command/src/main/java/es/dbiosag/command/infrasturcture/configuration/KafkaTopicConfig.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package es.dbiosag.command.infrasturcture.configuration;
-
-import org.apache.kafka.clients.admin.NewTopic;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.config.TopicBuilder;
-
-@Configuration
-public class KafkaTopicConfig {
-
-    @Value(value = "${message.topic.createPhone}")
-    private String topicName;
-
-    @Bean
-    public NewTopic topicProducePhone() {
-        return TopicBuilder.name(topicName).build();
-    }
-}
diff --git a/demo-command/src/main/resources/application.yml b/demo-command/src/main/resources/application.yml
index cbb57c8..ca46746 100644
--- a/demo-command/src/main/resources/application.yml
+++ b/demo-command/src/main/resources/application.yml
@@ -13,8 +13,9 @@ spring:
             enabled: true
 
     kafka:
-        bootstrap-servers: localhost:9092
-        consumer.group-id: phone-producers
+        bootstrap-servers: kafka1:9092
+        consumer:
+            group-id: test-consumer-group
 message:
     topic:
         createPhone: create-phone
\ No newline at end of file
diff --git a/demo-query/src/main/resources/application.yml b/demo-query/src/main/resources/application.yml
index b74efd1..e188c8d 100644
--- a/demo-query/src/main/resources/application.yml
+++ b/demo-query/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-    port: 8083
+    port: 8082
 spring:
     datasource:
         driverClassName: org.h2.Driver
@@ -13,8 +13,9 @@ spring:
             enabled: true
 
     kafka:
-        bootstrap-servers: localhost:9092
-        consumer.group-id: phone-producers
+        bootstrap-servers: kafka1:9092
+        consumer:
+            group-id: test-consumer-group
 message:
     topic:
         createPhone: create-phone
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 5818f8c..ecde9cb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,16 @@
 version: '2.1'
 
+networks:
+  test:
+
 services:
   zoo1:
     image: zookeeper:3.4.9
     hostname: zoo1
     ports:
       - "2181:2181"
+    networks:
+      - test
     environment:
       ZOO_MY_ID: 1
       ZOO_PORT: 2181
@@ -22,6 +27,7 @@ services:
     environment:
       KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka1:19092,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9092
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT
+      KAFKA_CREATE_TOPICS: create-phone:2:1
       KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_DOCKER_INTERNAL
       KAFKA_ZOOKEEPER_CONNECT: "zoo1:2181"
       KAFKA_BROKER_ID: 1
@@ -31,6 +37,13 @@ services:
       - ./zk-single-kafka-single/kafka1/data:/var/lib/kafka/data
     depends_on:
       - zoo1
+    networks:
+      - test
+    healthcheck:
+      test: [ "CMD", "nc", "-vz", "localhost", "9092" ]
+      interval: 30s
+      timeout: 10s
+      retries: 3
 
   demo-command:
     build:
@@ -41,27 +54,35 @@ services:
     ports:
       - "8081:8081"
     depends_on:
-      - zoo1
-      - kafka1
+      kafka1:
+        condition: service_healthy
+    networks:
+      - test
 
   demo-query-1:
     build:
       context: demo-query
       dockerfile: Dockerfile
     image: demo-query
+    hostname: demo-query-1
     ports:
       - "8082:8082"
     depends_on:
-      - zoo1
-      - kafka1
+      kafka1:
+        condition: service_healthy
+    networks:
+      - test
 
   demo-query-2:
     build:
       context: demo-query
       dockerfile: Dockerfile
     image: demo-query
+    hostname: demo-query-2
     ports:
-      - "8082:8083"
+      - "8083:8082"
     depends_on:
-      - zoo1
-      - kafka1
\ No newline at end of file
+      kafka1:
+        condition: service_healthy
+    networks:
+      - test