From 27cdb4ff1c388b13f76110f8e666a8a2d56fb951 Mon Sep 17 00:00:00 2001
From: dfarrelly <david.farrelly@est.tech>
Date: Fri, 1 Mar 2019 14:26:42 +0000
Subject: Update image tags in pom

*Update timestamp format
*Add second tag for latest

Issue-ID: DCAEGEN2-1250
Change-Id: I944a846415757383b7b7524c2841b3d5eac15717
Signed-off-by: dfarrelly <david.farrelly@est.tech>
---
 pom.xml | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 2b59034..ab5e050 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <surefire.version>2.22.0</surefire.version>
         <!-- Plugin Settings -->
         <image-name>${docker.push.registry}/onap/${project.groupId}.${project.artifactId}</image-name>
-        <maven.build.timestamp.format>yyyymmdd'T'hhmmss'Z'</maven.build.timestamp.format>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <timestamp>${maven.build.timestamp}</timestamp>
         <sonar.language>java</sonar.language>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -196,12 +196,43 @@
                 <version>${dockerfile.version}</version>
                 <configuration>
                     <repository>${image-name}</repository>
-                    <tag>${project.version}-${timestamp}</tag>
                     <dockerfile>${project.build.outputDirectory}/Dockerfile</dockerfile>
                     <buildArgs>
                         <JAR>${project.build.finalName}-jar-with-dependencies.jar</JAR>
                     </buildArgs>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>tag-version</id>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>tag</goal>
+                        </goals>
+                        <configuration>
+                            <tag>${project.version}-${timestamp}</tag>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>push-latest</id>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>push</goal>
+                        </goals>
+                        <configuration>
+                            <tag>latest</tag>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>push-version</id>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>push</goal>
+                        </goals>
+                        <configuration>
+                            <tag>${project.version}-${timestamp}</tag>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-- 
cgit 1.2.3-korg