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 (file)
--- a/cmso-database/pom.xml
+++ b/cmso-database/pom.xml
@@ -131,12 +131,14 @@
                                        <apiVersion>1.23</apiVersion>\r
                                        <images>\r
                                                                <image>\r
-                                                                               <name>onap/cmso-dbinit</name>\r
-                                                                               <alias>onap-cmso-dbinit</alias>\r
+                                                                               <name>onap/optf-cmso-dbinit</name>\r
+                                                                               <alias>onap-optf-cmso-dbinit</alias>\r
                                                                                <build>\r
                                                                                                <cleanup>true</cleanup>\r
                                                                                                <tags>\r
                                                                                                                <tag>latest</tag>\r
+                                                                                                               <tag>${project.docker.latesttagtimestamp.version}</tag>\r
+                                                                                                               <tag>${project.docker.latesttag.version}</tag>\r
                                                                                                </tags>\r
                                                                                                <dockerFile>${project.basedir}/src/main/docker/Dockerfile</dockerFile>\r
                                                                                                <assembly>\r
@@ -163,7 +165,7 @@
                                                        <goal>push</goal>\r
                                                </goals>\r
                                                <configuration>\r
-                                                       <image>onap/cmso-init:%l</image>\r
+                                                       <image>onap/optf-cmso-dbinit:%l</image>\r
                                                </configuration>\r
                                        </execution>\r
                                </executions>\r

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 (file)
--- 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 (file)
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -371,12 +371,14 @@
                                        <apiVersion>1.23</apiVersion>\r
                                        <images>\r
                                                                <image>\r
-                                                                               <name>onap/cmso-service</name>\r
-                                                                               <alias>onap-cmso-service</alias>\r
+                                                                               <name>onap/optf-cmso-service</name>\r
+                                                                               <alias>onap-optf-cmso-service</alias>\r
                                                                                <build>\r
                                                                                                <cleanup>true</cleanup>\r
                                                                                                <tags>\r
                                                                                                                <tag>latest</tag>\r
+                                                                                                               <tag>${project.docker.latesttagtimestamp.version}</tag>\r
+                                                                                                               <tag>${project.docker.latesttag.version}</tag>                                                                                          \r
                                                                                                </tags>\r
                                                                                                <dockerFile>${project.basedir}/src/main/docker/Dockerfile</dockerFile>\r
                                                                                                <assembly>\r
@@ -403,7 +405,7 @@
                                                        <goal>push</goal>\r
                                                </goals>\r
                                                <configuration>\r
-                                                       <image>onap/cmso-service:%l</image>\r
+                                                       <image>onap/optf-cmso-service:%l</image>\r
                                                </configuration>\r
                                        </execution>\r
                                </executions>\r