Fix config dir name

Config directory (SDNC_CONFIG_DIR) for CCSDK should be
/opt/onap/ccsdk/data/properties.

Change-Id: Ib9da44e19236414202400033c8ad251b2913f4fd
Issue-ID: CCSDK-208
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Update docker-compose.yml

docker-compose.yml is using Amsterdam images instead of Beijing

Change-Id: Ie0ca17265cbd50e9e7baad90e7a1218e08cc4537
Issue-ID: CCSDK-208
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>

diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile
index 74dd514..a31fcff 100644 (file)
--- a/odlsli/src/main/docker/Dockerfile
+++ b/odlsli/src/main/docker/Dockerfile
@@ -3,7 +3,7 @@ FROM onap/ccsdk-odl-image:${project.version}
 MAINTAINER CCSDK Team (onap-ccsdk@lists.openecomp.org)
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 ENV ODL_HOME /opt/opendaylight/current
 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
 
 # copy the opendaylight credentials
 COPY idmlight.db.mv.db /opt/opendaylight/current

diff --git a/src/main/yaml/docker-compose.yml b/src/main/yaml/docker-compose.yml
index f65a510..4e0be9e 100644 (file)
--- a/src/main/yaml/docker-compose.yml
+++ b/src/main/yaml/docker-compose.yml
@@ -17,7 +17,7 @@ services:
   
       
   bareodl:
   
       
   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:
     container_name: ccsdk_bareodl_container
     entrypoint: ["/opt/opendaylight/current/bin/karaf"]
     ports:


@@ -32,7 +32,7 @@ services:
         max-file: "5"
   
   odlsli:
         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
     depends_on :
       - db
     container_name: ccsdk_odlsli_container


@@ -53,7 +53,7 @@ services:
         max-file: "5"
   
   dgbuilder:
         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
     depends_on:
       - db
     container_name:  ccsdk_dgbuilder_container