From 9803b013cb3c139edd1c0283495ea5c3a0d99420 Mon Sep 17 00:00:00 2001
From: xxcxy <bert7914@gmail.com>
Date: Fri, 14 Feb 2020 09:57:53 +0800
Subject: [PATCH] Make Kafka service accessible both inside and outside
 container

---
 local/full/docker-compose.yml             | 14 ++++++++++----
 local/full/kafka-client/Dockerfile        |  2 +-
 local/full/kafka-client/create-topics.sh  |  2 +-
 local/kafka/kafka-client/create-topics.sh |  0
 4 files changed, 12 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 local/kafka/kafka-client/create-topics.sh

diff --git a/local/full/docker-compose.yml b/local/full/docker-compose.yml
index b6f0f207..7b0daad1 100644
--- a/local/full/docker-compose.yml
+++ b/local/full/docker-compose.yml
@@ -29,18 +29,24 @@ services:
       file: ../docker-compose.yml
       service: queue
   zookeeper:
-    image: confluent/zookeeper
+    image: wurstmeister/zookeeper
     ports:
       - "2181:2181"
     environment:
       zk_id: "1"
   kafka:
-    image: confluent/kafka
+    image: wurstmeister/kafka
     container_name: tc-projects-kafka
     depends_on:
       - zookeeper
     ports:
       - "9092:9092"
+    environment:
+      KAFKA_ADVERTISED_LISTENERS: INSIDE://kafka:9093,OUTSIDE://localhost:9092
+      KAFKA_LISTENERS: INSIDE://kafka:9093,OUTSIDE://0.0.0.0:9092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
   kafka-client:
     build: ./kafka-client
     depends_on:
@@ -63,7 +69,7 @@ services:
       - kafka-client
     environment:
       - PORT=3000
-      - KAFKA_URL=kafka:9092
+      - KAFKA_URL=kafka:9093
       - JWT_TOKEN_SECRET=secret
       - VALID_ISSUERS="[\"https://topcoder-newauth.auth0.com/\",\"https://api.topcoder-dev.com\"]"
   project-processor-es:
@@ -82,7 +88,7 @@ services:
       - kafka-client
     environment:
       - PORT=5000
-      - KAFKA_URL=kafka:9092
+      - KAFKA_URL=kafka:9093
       - ES_HOST=esearch:9200
   tc-notifications-reset-db:
     extends:
diff --git a/local/full/kafka-client/Dockerfile b/local/full/kafka-client/Dockerfile
index 3d332b83..15c20839 100644
--- a/local/full/kafka-client/Dockerfile
+++ b/local/full/kafka-client/Dockerfile
@@ -1,4 +1,4 @@
-From confluent/kafka
+From wurstmeister/kafka
 WORKDIR /app/
 COPY topics.txt .
 COPY create-topics.sh .
diff --git a/local/full/kafka-client/create-topics.sh b/local/full/kafka-client/create-topics.sh
index c5b33e62..a4116901 100755
--- a/local/full/kafka-client/create-topics.sh
+++ b/local/full/kafka-client/create-topics.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 while read topic; do
-  /usr/bin/kafka-topics --create --zookeeper zookeeper:2181 --partitions 1 --replication-factor 1 --topic $topic
+  /opt/kafka/bin/kafka-topics.sh --create --zookeeper zookeeper:2181 --partitions 1 --replication-factor 1 --topic $topic
 done < topics.txt
diff --git a/local/kafka/kafka-client/create-topics.sh b/local/kafka/kafka-client/create-topics.sh
old mode 100644
new mode 100755