update docker-compose

[dmaap/messagerouter/messageservice.git] / src / main / resources / docker-compose / docker-compose.yml

diff --git a/src/main/resources/docker-compose/docker-compose.yml b/src/main/resources/docker-compose/docker-compose.yml
index b10d8c0..d6db315 100644 (file)
--- a/src/main/resources/docker-compose/docker-compose.yml
+++ b/src/main/resources/docker-compose/docker-compose.yml
@@ -1,29 +1,46 @@
 version: '2'
 services:
   zookeeper:
-    image: wurstmeister/zookeeper
+    image: nexus3.onap.org:10001/onap/dmaap/zookeeper:5.0.0
     ports:
       - "2181:2181"
+
   kafka:
-    build: .
-    ports:
-      - "9092:9092"
-    environment:
-      KAFKA_ADVERTISED_HOST_NAME: 172.18.0.1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+   image: nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.0
+   ports:
+    - "9092:9092"
+   environment:
+    # 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
+    KAFKA_LOG_DIRS: /opt/kafka/data
+    # 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
+    #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 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
+    KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL_PLAINTEXT
+   volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+   depends_on:
+    - zookeeper
 
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    depends_on:
-      - zookeeper
-      
   dmaap:
-    image: attos/dmaap
+    image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.13
     ports:
       - "3904:3904"
       - "3905:3905"
     volumes:
-      - /var/tmp/MsgRtrApi.properties:/appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties  
+      - /var/tmp/MsgRtrApi.properties:/appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
     depends_on:
       - zookeeper
-      - kafka    
+      - kafka