From: Timoney, Daniel (dt5972) <dtimoney@att.com>
Date: Wed, 22 Mar 2017 15:08:28 +0000 (+0000)
Subject: [DOCKER] Add 1.0-STAGING-latest docker tag
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e306bc113925e23ab815b0589f852a5767fa7687;p=sdnc%2Foam.git

[DOCKER] Add 1.0-STAGING-latest docker tag

Replace 'latest' with '1.0-STAGING-latest' in release-1.0.0 branch

Change-Id: I59822fb94c34715ac44b50899e7f47e36c8b1eda
Signed-off-by: Timoney, Daniel (dt5972) <dtimoney@att.com>

[DOCKER] Update image name

Change image names from ecomp/* to openecomp/*

Change-Id: Ib7607a345e5862b88f532168df22b5fbc6685577
Signed-off-by: Timoney, Daniel (dt5972) <dtimoney@att.com>

Former-commit-id: d72875d051fb2df4c5b20834c1599d16cdf8d669
---

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 55b48375..953dbbcd 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -18,7 +18,7 @@
     <description>Creates admportal Docker container</description>
 
     <properties>
-        <image.name>ecomp/admportal-sdnc-image</image.name>
+        <image.name>openecomp/admportal-sdnc-image</image.name>
     </properties>
 
 
diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile
index 8facc58b..4006af3e 100644
--- a/installation/admportal/src/main/docker/Dockerfile
+++ b/installation/admportal/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM ecomp/ubuntu-sdnc-image:${project.version}
+FROM openecomp/ubuntu-sdnc-image:${project.version}
 MAINTAINER SDN-C Team (sdnc@lists.openecomp.org)
 
 # create link for pm2
diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index 3d2ecb59..d2ba7c0a 100644
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -18,7 +18,7 @@
 	<description>Creates docker container for dgbuilder</description>
 
 	<properties>
-		<image.name>ecomp/dgbuilder-sdnc-image</image.name>
+		<image.name>openecomp/dgbuilder-sdnc-image</image.name>
 	</properties>
 
 
diff --git a/installation/dgbuilder/src/main/docker/Dockerfile b/installation/dgbuilder/src/main/docker/Dockerfile
index fd91e773..1e7e6035 100644
--- a/installation/dgbuilder/src/main/docker/Dockerfile
+++ b/installation/dgbuilder/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM ecomp/ubuntu-sdnc-image:${project.version}
+FROM openecomp/ubuntu-sdnc-image:${project.version}
 MAINTAINER SDN-C Team (sdnc@lists.openecomp.org)
 
 # copy openecomp
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index efd26d5f..26b55419 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -18,7 +18,7 @@
 	<description>Creates SDN Controller Docker container</description>
 
 	<properties>
-		<image.name>ecomp/sdnc-image</image.name>
+		<image.name>openecomp/sdnc-image</image.name>
 		<sdnc.core.version>${project.version}</sdnc.core.version>
 		<sdnc.adaptors.version>${project.version}</sdnc.adaptors.version>
 		<sdnc.northbound.version>${project.version}</sdnc.northbound.version>
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 2e2140bc..d211a48d 100644
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM ecomp/ubuntu-sdnc-image:${project.version}
+FROM openecomp/ubuntu-sdnc-image:${project.version}
 MAINTAINER SDN-C Team (sdnc@lists.openecomp.org)
 ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64
 ENV ODL_HOME /opt/opendaylight/current
diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index 8baa11f8..62f9de1c 100644
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -17,7 +17,7 @@ services:
   
       
   sdnc:
-    image: ${NEXUS_DOCKER_REPO}/ecomp/sdnc-image:1.0.0
+    image: openecomp/sdnc-image:latest
     depends_on :
       - db
     container_name: sdnc_controller_container
@@ -39,7 +39,7 @@ services:
   
   
   web:
-    image: ${NEXUS_DOCKER_REPO}/ecomp/admportal-sdnc-image:1.0.0
+    image: openecomp/admportal-sdnc-image
     depends_on:
       - db
     container_name: sdnc_portal_container
@@ -65,7 +65,7 @@ services:
   
   
   dgbuilder:
-    image: ${NEXUS_DOCKER_REPO}/ecomp/dgbuilder-sdnc-image:1.0.0
+    image: openecomp/dgbuilder-sdnc-image:1.0.0
     depends_on:
       - db
     container_name:  sdnc_dgbuilder_container
diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml
index 903c538b..dcaf2cb8 100644
--- a/installation/ubuntu/pom.xml
+++ b/installation/ubuntu/pom.xml
@@ -18,7 +18,7 @@
 	<description>Creates base ubuntu Docker container</description>
 
 	<properties>
-		<image.name>ecomp/ubuntu-sdnc-image</image.name>
+		<image.name>openecomp/ubuntu-sdnc-image</image.name>
 	</properties>