From: Jerry Flood <jflood@att.com>
Date: Fri, 19 Oct 2018 00:22:52 +0000 (-0400)
Subject: Update the image name and add tags
X-Git-Tag: 1.0.1~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F74%2F70774%2F1;p=optf%2Fcmso.git

Update the image name and add tags

Issue-ID: OPTFRA-373
Change-Id: Ifcd6c3a8af1a84be2a9ba303343a1b515d10bec7
Signed-off-by: Jerry Flood <jflood@att.com>
---

diff --git a/cmso-database/pom.xml b/cmso-database/pom.xml
index 7a7146e..2b2afc0 100644
--- a/cmso-database/pom.xml
+++ b/cmso-database/pom.xml
@@ -131,12 +131,14 @@
 			                <apiVersion>1.23</apiVersion>
 			                <images>
 								<image>
-										<name>onap/cmso-dbinit</name>
-										<alias>onap-cmso-dbinit</alias>
+										<name>onap/optf-cmso-dbinit</name>
+										<alias>onap-optf-cmso-dbinit</alias>
 										<build>
 												<cleanup>true</cleanup>
 												<tags>
 														<tag>latest</tag>
+														<tag>${project.docker.latesttagtimestamp.version}</tag>
+														<tag>${project.docker.latesttag.version}</tag>
 												</tags>
 												<dockerFile>${project.basedir}/src/main/docker/Dockerfile</dockerFile>
 												<assembly>
@@ -163,7 +165,7 @@
 			                                <goal>push</goal>
 			                        </goals>
 			                        <configuration>
-			                                <image>onap/cmso-init:%l</image>
+			                                <image>onap/optf-cmso-dbinit:%l</image>
 			                        </configuration>
 			                </execution>
 			        </executions>
diff --git a/cmso-service/extra/docker/cmso-service/docker-compose.yml b/cmso-service/extra/docker/cmso-service/docker-compose.yml
index d483e55..0621d94 100644
--- a/cmso-service/extra/docker/cmso-service/docker-compose.yml
+++ b/cmso-service/extra/docker/cmso-service/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - "3306:3306"
 
   db-init:
-    image: onap/cmso-dbinit
+    image: onap/optf-cmso-dbinit
     volumes:
       - "../etc:/share/etc:rw"
       - "../logs:/share/logs:rw"
@@ -20,7 +20,7 @@ services:
       - db
 
   cmso-service:
-    image: onap/cmso-service
+    image: onap/optf-cmso-service
     volumes:
       - "../etc:/share/etc:rw"
       - "../logs:/share/logs:rw"
diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index b69e0fd..e1622bd 100644
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -371,12 +371,14 @@
 			                <apiVersion>1.23</apiVersion>
 			                <images>
 								<image>
-										<name>onap/cmso-service</name>
-										<alias>onap-cmso-service</alias>
+										<name>onap/optf-cmso-service</name>
+										<alias>onap-optf-cmso-service</alias>
 										<build>
 												<cleanup>true</cleanup>
 												<tags>
 														<tag>latest</tag>
+														<tag>${project.docker.latesttagtimestamp.version}</tag>
+														<tag>${project.docker.latesttag.version}</tag>												
 												</tags>
 												<dockerFile>${project.basedir}/src/main/docker/Dockerfile</dockerFile>
 												<assembly>
@@ -403,7 +405,7 @@
 			                                <goal>push</goal>
 			                        </goals>
 			                        <configuration>
-			                                <image>onap/cmso-service:%l</image>
+			                                <image>onap/optf-cmso-service:%l</image>
 			                        </configuration>
 			                </execution>
 			        </executions>