X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fdocker-compose%2Fdocker-compose.yml;h=c278e11a43d8e888db044b52c96a036b3c935147;hb=d7013af5e932661dffa1270a0334ac9f0f086e78;hp=40a183e867df38dd65c2aa8e914fe0087c22b2ea;hpb=80d6c640248271da46157fd3189f72b20596ea1b;p=dmaap%2Fmessagerouter%2Fmessageservice.git

diff --git a/src/main/resources/docker-compose/docker-compose.yml b/src/main/resources/docker-compose/docker-compose.yml
index 40a183e..c278e11 100644
--- a/src/main/resources/docker-compose/docker-compose.yml
+++ b/src/main/resources/docker-compose/docker-compose.yml
@@ -1,20 +1,23 @@
 version: '2'
 services:
   zookeeper:
-    image: wurstmeister/zookeeper
+    image: nexus3.onap.org:10001/onap/dmaap/zookeeper:6.0.0
     ports:
       - "2181:2181"
 
   kafka:
-   #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
+   image: nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.1
    ports:
     - "9092:9092"
    environment:
-    enableCadi: false
+    # For creating authenticated topics add AAF locate aplication ip address to host alias aaf-onap-test.osaaf.org
+    # For creating the authenticated topics enable the following property
+    enableCadi: 'false'
     KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-    #Properties required for using the CADI integrated Kafka
+    KAFKA_LOG_DIRS: /opt/kafka/data
+    KAFKA_ZOOKEEPER_CONNECTION_TIMEOUT_MS: 40000
+    KAFKA_ZOOKEEPER_SESSION_TIMEOUT_MS: 40000
+    # Uncomment the following lines to create authenticated topics
     #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
@@ -23,7 +26,7 @@ services:
     #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 is enabled
+    # Remove the following 4 lines to create authenticated topics
     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
@@ -34,9 +37,7 @@ services:
     - zookeeper
 
   dmaap:
-    #CADI integrated MR image
-    #image: ${NEXUS_DOCKER_REPO}/onap/dmaap/dmaap-mr:1.1.7
-    image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.6
+    image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.14
     ports:
       - "3904:3904"
       - "3905:3905"