Bumped the version

[dmaap/messagerouter/messageservice.git] / demo / docker_files / __docker-compose.yml

diff --git a/demo/docker_files/__docker-compose.yml b/demo/docker_files/__docker-compose.yml
index 3a02a88..e2fa2e7 100644 (file)
--- a/demo/docker_files/__docker-compose.yml
+++ b/demo/docker_files/__docker-compose.yml
@@ -18,14 +18,28 @@ services:
         max-file: "5"
 
   kafka:
-    image: wurstmeister/kafka:1.1.0
+    #CADI integrated kafka image
+    #image: nexus3.onap.org:10001/onap/dmaap/kafka01101:0.0.2
+    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
+      enableCadi: 'false'
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_BROKER_ID: 1
+      #Properties required for using the CADI integrated Kafka
+      #KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT,EXTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT
+      #KAFKA_ADVERTISED_LISTENERS: INTERNAL_SASL_PLAINTEXT://kafka:9092
+      #KAFKA_LISTENERS: INTERNAL_SASL_PLAINTEXT://0.0.0.0:9092
+      #KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL_SASL_PLAINTEXT
+      #KAFKA_SASL_ENABLED_MECHANISMS: PLAIN
+      #KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL: PLAIN
+      #KAFKA_AUTHORIZER_CLASS_NAME: org.onap.dmaap.kafkaAuthorize.KafkaCustomAuthorizer
+      #aaf_locate_url: https://aaf-onap-test.osaaf.org:8095
+      #Remove the below 4 properties if CADI
+      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 +51,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.8
     ports:
       - "3904:3904"
       - "3905:3905"