Fix container name for dmaap

[sdnc/oam.git] / installation / src / main / yaml / docker-compose.yml

diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index bb9acfb..93b3020 100644 (file)
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 networks:
   default:
@@ -24,20 +24,23 @@ services:
 
 
   sdnc:
-    image: openecomp/sdnc-image:latest
+    image: onap/sdnc-image:latest
     depends_on :
       - db
     container_name: sdnc_controller_container
-    entrypoint: ["/opt/openecomp/sdnc/bin/startODL.sh"]
+    entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
     ports:
       - "8282:8181"
+      - "8201:8101"
     links:
       - db:dbhost
       - db:sdnctldb01
       - db:sdnctldb02
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
+      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+    dns:
+      - ${DNS_IP_ADDR-10.0.100.1}
     logging:
       driver:   "json-file"
       options:
@@ -46,14 +49,14 @@ services:
 
 
   web:
-    image: openecomp/admportal-sdnc-image:latest
+    image: onap/admportal-sdnc-image:latest
     depends_on:
       - db
     container_name: sdnc_portal_container
     entrypoint:
        - "/bin/bash"
        - "-c"
-       - "cd /opt/openecomp/sdnc/admportal/shell && ./start_portal.sh"
+       - "cd /opt/onap/sdnc/admportal/shell && ./start_portal.sh"
     ports:
       - "8843:8843"
     links:
@@ -63,7 +66,7 @@ services:
       - sdnc:sdnhost
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
+      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
     logging:
       driver:   "json-file"
       options:
@@ -72,14 +75,14 @@ services:
 
 
   dgbuilder:
-    image: openecomp/dgbuilder-sdnc-image:latest
+    image: onap/ccsdk-dgbuilder-image:latest
     depends_on:
       - db
     container_name:  sdnc_dgbuilder_container
     entrypoint:
        - "/bin/bash"
        - "-c"
-       - "cd /opt/openecomp/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait"
+       - "cd /opt/onap/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait"
     ports:
       - "3000:3100"
     links:
@@ -89,7 +92,7 @@ services:
       - sdnc:sdnhost
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
+      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
     logging:
       driver:   "json-file"
       options:
@@ -97,3 +100,42 @@ services:
         max-file: "5"
 
 
+  ueblistener:
+    image: onap/sdnc-ueb-listener-image:latest
+    depends_on:
+      - db
+    container_name:  sdnc_ueblistener_container
+    entrypoint: ["/opt/onap/sdnc/ueb-listener/bin/start-ueb-listener.sh" ]
+    links:
+      - db:dbhost
+      - db:sdnctldb01
+      - db:sdnctldb02
+      - sdnc:sdnhost
+    environment:
+      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - PROPERTY_DIR=/opt/onap/sdnc/data/properties
+    logging:
+      driver:   "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+
+  dmaaplistener:
+    image: onap/sdnc-dmaap-listener-image:latest
+    depends_on:
+      - db
+    container_name:  sdnc_dmaaplistener_container
+    entrypoint: ["/opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh" ]
+    links:
+      - db:dbhost
+      - db:sdnctldb01
+      - db:sdnctldb02
+      - sdnc:sdnhost
+    environment:
+      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - PROPERTY_DIR=/opt/onap/sdnc/data/properties
+    logging:
+      driver:   "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"