commit 1a64873e9c2c8c2ec137109fc7c3ddeb5511c039
author Dan Timoney <dt5972@att.com> Fri Mar 16 19:14:30 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Fri Mar 16 19:14:30 2018 +0000
tree ccb5614e4463c0e50078e79ac9141c9d2760ce91
parent 396a00cc15aca11fb73cd65d5731436d85be4dba
parent 6d1e46d4d3f99339184a15368050f5958e588b24

Merge "changed the references of sdnc to ccsdk"

odlsli/src/main/docker/Dockerfile

diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile
index 74dd514..a31fcff 100644
--- a/odlsli/src/main/docker/Dockerfile
+++ b/odlsli/src/main/docker/Dockerfile
@@ -3,7 +3,7 @@
 MAINTAINER CCSDK Team (onap-ccsdk@lists.openecomp.org)
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 ENV ODL_HOME /opt/opendaylight/current
-ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
+ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
 
 # copy the opendaylight credentials
 COPY idmlight.db.mv.db /opt/opendaylight/current

src/main/yaml/docker-compose.yml

diff --git a/src/main/yaml/docker-compose.yml b/src/main/yaml/docker-compose.yml
index f65a510..4e0be9e 100644
--- a/src/main/yaml/docker-compose.yml
+++ b/src/main/yaml/docker-compose.yml
@@ -17,7 +17,7 @@
   
       
   bareodl:
-    image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odl-image:0.1-STAGING-latest
+    image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odl-image:0.2-STAGING-latest
     container_name: ccsdk_bareodl_container
     entrypoint: ["/opt/opendaylight/current/bin/karaf"]
     ports:
@@ -32,7 +32,7 @@
         max-file: "5"
   
   odlsli:
-    image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odlsli-image:0.1-STAGING-latest
+    image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odlsli-image:0.2-STAGING-latest
     depends_on :
       - db
     container_name: ccsdk_odlsli_container
@@ -53,7 +53,7 @@
         max-file: "5"
   
   dgbuilder:
-    image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-dgbuilder-image:0.1-STAGING-latest
+    image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-dgbuilder-image:0.2-STAGING-latest
     depends_on:
       - db
     container_name:  ccsdk_dgbuilder_container