X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsrc%2Fmain%2Fyaml%2Fdocker-compose.yml;h=c74eacec2587604d83d4d7201f97fd567c067aca;hb=eec2e28aef98163257e5a527ca684804dab8ee7d;hp=cbba11763a47675679c1c04d620b67395ddac75f;hpb=55c6dc7742779a81c7ee8ed1edeb32db7a6cad60;p=sdnc%2Foam.git

diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index cbba1176..c74eacec 100644
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -1,10 +1,10 @@
-version: '2'
+version: '2.1'
 
 networks:
-  default:
-    driver: bridge
-    driver_opts:
-      com.docker.network.driver.mtu: ${MTU}
+  default:
+    driver: bridge
+    driver_opts:
+      com.docker.network.driver.mtu: ${MTU}
 
 
 services:
@@ -16,19 +16,19 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - MYSQL_ROOT_HOST=%
-    logging:       
+    logging:
       driver:   "json-file"
-      options:  
+      options:
         max-size: "30m"
         max-file: "5"
-  
-      
+
+
   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"
     links:
@@ -37,23 +37,25 @@ services:
       - db:sdnctldb02
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
-    logging:       
+      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+    dns:
+      - ${DNS_IP_ADDR-10.0.100.1}
+    logging:
       driver:   "json-file"
-      options:  
+      options:
         max-size: "30m"
         max-file: "5"
-  
-  
+
+
   web:
-    image: openecomp/admportal-sdnc-image:latest
+    image: onap/admportal-sdnc-image:latest
     depends_on:
       - db
     container_name: sdnc_portal_container
-    entrypoint: 
+    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,23 +65,23 @@ services:
       - sdnc:sdnhost
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
-    logging:       
+      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+    logging:
       driver:   "json-file"
-      options:  
+      options:
         max-size: "30m"
         max-file: "5"
-  
-  
+
+
   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/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait"
     ports:
       - "3000:3100"
     links:
@@ -89,11 +91,11 @@ services:
       - sdnc:sdnhost
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
-    logging:       
+      - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
+    logging:
       driver:   "json-file"
-      options:  
+      options:
         max-size: "30m"
         max-file: "5"
-  
-  
+
+