Changing docker image tagging

Change-Id: Ia01e0821d736ba0035eeabaf221efab32c5f838f
Signed-off-by: Patrick Brady <pb071s@att.com>

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 3cc856d..0fcf76f 100644 (file)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -17,7 +17,7 @@ services:
   
       
   appc:
-    image: "${NEXUS_DOCKER_REPO}/ecomp/appc-image:latest"
+    image: "openecomp/appc-image:latest"
     depends_on :
       - db
     container_name: appc_controller_container
@@ -42,7 +42,7 @@ services:
   
   
   dgbuilder:
-    image: "${NEXUS_DOCKER_REPO}/ecomp/dgbuilder-sdnc-image:latest"
+    image: "openecomp/dgbuilder-sdnc-image:latest"
     depends_on:
       - db
     container_name:  sdnc_dgbuilder_container

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index a959701..62a9f9d 100644 (file)
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -205,8 +205,8 @@
                                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                                                                <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
                                                                                <tags>
-                                                                                       <tag>${appc.docker.staging.version}-STAGING-${maven.build.timestamp}</tag>
-                                                                                       <tag>latest</tag> 
+                                                                                       <!-- <tag>${appc.docker.staging.version}-STAGING-${maven.build.timestamp}</tag> -->
+                                                                                       <tag>${appc.docker.staging.version}-STAGING-latest</tag>
                                                                                </tags>
                                                                        </build>
                                                                </image>

diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile
index 8b2addf..33fde7f 100644 (file)
--- a/installation/appc/src/main/docker/Dockerfile
+++ b/installation/appc/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM ecomp/sdnc-image:1.0.0-SNAPSHOT
+FROM openecomp/sdnc-image:latest
 MAINTAINER APP-C Team (appc@lists.openecomp.org)
 
 # copy openecomp