Deployment onap rename

[appc/deployment.git] / docker-compose / docker-compose.yml

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 3cc856d..d7d1665 100644 (file)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -1,5 +1,11 @@
 version: '2'
 
+networks:
+  default:
+    driver: bridge
+    driver_opts:
+      com.docker.network.driver.mtu: ${MTU}
+
 services:
   db:
     image: mysql/mysql-server:5.6
@@ -9,19 +15,21 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - MYSQL_ROOT_HOST=%
-    logging:       
-      driver:   "json-file"
+    logging:
+      driver: "json-file"
       options:  
         max-size: "30m"
         max-file: "5"
-  
-      
+
+# Tweaking SDNC_CONFIG_DIR temporarily from ../sdnc/.. to ../appc/.. since it may be needed in this script
+#    to map to SDN-C AAI Service Bundle's AAI Activator class inside the gerrit sdnc/adaptors repo, so that
+#    the AAI Service bundle loads APP-C's aaiclient.properties instead of SDN-C's aaiclient.properties.
   appc:
-    image: "${NEXUS_DOCKER_REPO}/ecomp/appc-image:latest"
+    image: "onap/appc-image:latest"
     depends_on :
       - db
     container_name: appc_controller_container
-    entrypoint: ["/opt/openecomp/appc/bin/startODL.sh"]
+    entrypoint: ["/opt/onap/appc/bin/startODL.sh"]
     ports:
       - "8282:8181"
       - "1830:1830"
@@ -31,25 +39,25 @@ services:
       - db:sdnctldb02
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
-      - APPC_CONFIG_DIR=/opt/openecomp/appc/data/properties
+      - SDNC_CONFIG_DIR=/opt/onap/appc/data/properties
+      - APPC_CONFIG_DIR=/opt/onap/appc/data/properties
       - DMAAP_TOPIC_ENV=SUCCESS
     logging:
-      driver:   "json-file"
+      driver: "json-file"
       options:
         max-size: "30m"
         max-file: "5"
-  
-  
+
+
   dgbuilder:
-    image: "${NEXUS_DOCKER_REPO}/ecomp/dgbuilder-sdnc-image:latest"
+    image: "onap/ccsdk-dgbuilder-image:latest"
     depends_on:
       - db
-    container_name:  sdnc_dgbuilder_container
+    container_name: sdnc_dgbuilder_container
     entrypoint:
        - "/bin/bash"
        - "-c"
-       - "cd /opt/openecomp/sdnc/dgbuilder/ && ./start sdnc1.0 && wait"
+       - "cd /opt/onap/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait"
     ports:
       - "3000:3100"
     links:
@@ -59,10 +67,10 @@ services:
       - appc:sdnhost
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
-      - APPC_CONFIG_DIR=/opt/openecomp/appc/data/properties
-    logging:       
-      driver:   "json-file"
-      options:  
+      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+    logging:
+      driver: "json-file"
+      options:
         max-size: "30m"
         max-file: "5"
+