From 224d06e2bc5734310a65df2df0a920b2888bacc6 Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
Date: Thu, 18 Oct 2018 20:22:52 -0400
Subject: Update the image name and add tags

Issue-ID: OPTFRA-373
Change-Id: Ifcd6c3a8af1a84be2a9ba303343a1b515d10bec7
Signed-off-by: Jerry Flood <jflood@att.com>
---
 cmso-service/extra/docker/cmso-service/docker-compose.yml | 4 ++--
 cmso-service/pom.xml                                      | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'cmso-service')

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>
-- 
cgit 1.2.3-korg