summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsunil unnava <su622b@att.com>2018-09-04 19:05:57 -0400
committersunil unnava <su622b@att.com>2018-09-04 19:07:31 -0400
commit2d38b0e6e6dc235a20a9378200bbf53828e78c26 (patch)
treee48038313eb47deebd26cedc7f72f78ce79f8feb
parent00f7502909d5ccf0dc533ab07b161b4aa1bdba11 (diff)
docker compose changes for Kafka 11 upgrade
Issue-ID: DMAAP-713 Change-Id: I198ae377736a7b1cb214b0f8344c0b3ff96c2457 Signed-off-by: sunil unnava <su622b@att.com>
-rw-r--r--demo/docker_files/__docker-compose.yml11
-rw-r--r--src/main/resources/docker-compose/docker-compose.yml9
2 files changed, 12 insertions, 8 deletions
diff --git a/demo/docker_files/__docker-compose.yml b/demo/docker_files/__docker-compose.yml
index 3a02a88..1606960 100644
--- a/demo/docker_files/__docker-compose.yml
+++ b/demo/docker_files/__docker-compose.yml
@@ -18,14 +18,15 @@ services:
max-file: "5"
kafka:
- image: wurstmeister/kafka:1.1.0
+ image: nexus3.onap.org:10001/onap/dmaap/kafka01101:0.0.1
ports:
- "9092:9092"
environment:
- #KAFKA_ADVERTISED_HOST_NAME: {{ ip.docker0 }}
- KAFKA_ADVERTISED_HOST_NAME: kafka
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
- KAFKA_BROKER_ID: 1
+ KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL_PLAINTEXT:PLAINTEXT,EXTERNAL_PLAINTEXT:PLAINTEXT
+ KAFKA_ADVERTISED_LISTENERS: INTERNAL_PLAINTEXT://kafka:9092
+ KAFKA_LISTENERS: INTERNAL_PLAINTEXT://0.0.0.0:9092
+ KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL_PLAINTEXT
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./data-kafka:/kafka
@@ -37,7 +38,7 @@ services:
max-file: "5"
dmaap:
- image: ${NEXUS_DOCKER_REPO}/onap/dmaap/dmaap-mr:1.1.4
+ image: ${NEXUS_DOCKER_REPO}/onap/dmaap/dmaap-mr:1.1.6
ports:
- "3904:3904"
- "3905:3905"
diff --git a/src/main/resources/docker-compose/docker-compose.yml b/src/main/resources/docker-compose/docker-compose.yml
index 12343af..aece067 100644
--- a/src/main/resources/docker-compose/docker-compose.yml
+++ b/src/main/resources/docker-compose/docker-compose.yml
@@ -6,19 +6,22 @@ services:
- "2181:2181"
kafka:
- image: wurstmeister/kafka:1.1.0
+ image: nexus3.onap.org:10001/onap/dmaap/kafka01101:0.0.1
ports:
- "9092:9092"
environment:
- HOSTNAME_COMMAND: "hostname -i"
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+ KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL_PLAINTEXT:PLAINTEXT,EXTERNAL_PLAINTEXT:PLAINTEXT
+ KAFKA_ADVERTISED_LISTENERS: INTERNAL_PLAINTEXT://kafka:9092
+ KAFKA_LISTENERS: INTERNAL_PLAINTEXT://0.0.0.0:9092
+ KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL_PLAINTEXT
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on:
- zookeeper
dmaap:
- image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.4
+ image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.6
ports:
- "3904:3904"
- "3905:3905"