From 122dfc196731eb3b5831f7053518f7bc684a404a Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Wed, 13 Feb 2019 19:15:21 +0200
Subject: Add dockers tag with timestamp and latest

Change-Id: I22d1b3bd50c780ae1aff8eb49078a9f098cb55c7
Issue-ID: VID-421
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 deliveries/pom.xml | 214 +++++++++++++++++++++++++++--------------------------
 1 file changed, 110 insertions(+), 104 deletions(-)

diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index 1b89e1e5c..13db1c7ca 100755
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -1,104 +1,110 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.vid</groupId>
-        <artifactId>vid-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <packaging>pom</packaging>
-    <artifactId>vid-deliveries</artifactId>
-
-    <name>VID Deliveries</name>
-    <description>ONAP VID Deliveries</description>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <docker.push.registry>${docker_registry}</docker.push.registry>
-        <docker.verbose>true</docker.verbose>
-    </properties>
-
-    <profiles>
-
-        <profile>
-            <id>docker-proxy</id>
-            <!-- activate profile if environment variable `http_proxy` is set -->
-            <activation>
-                <property>
-                    <name>env.http_proxy</name>
-                </property>
-            </activation>
-            <properties>
-                <docker.buildArg.http_proxy>${env.http_proxy}</docker.buildArg.http_proxy>
-            </properties>
-        </profile>
-
-    </profiles>
-
-    <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.28.0</version>
-
-                <configuration>
-                    <verbose>true</verbose>
-                    <apiVersion>1.23</apiVersion>
-                    <images>
-                        <image>
-                            <name>onap/vid:${project.version}</name>
-                            <build>
-                                <cleanup>remove</cleanup>
-                                <dockerFileDir>docker-files</dockerFileDir>
-                                <assembly>
-                                    <basedir>/</basedir>
-                                    <user>vidadmin:vidadmin:vidadmin</user>
-                                    <descriptor>assembly/assembly-for-plugin.xml</descriptor>
-                                </assembly>
-                                <tags>
-                                    <tag>4.0-STAGING-latest</tag>
-                                    <tag>latest</tag>
-                                </tags>
-
-                            </build>
-                        </image>
-                    </images>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <id>generate-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-
-                    <execution>
-                        <id>push-image</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.vid</groupId>
+        <artifactId>vid-parent</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+    </parent>
+
+    <packaging>pom</packaging>
+    <artifactId>vid-deliveries</artifactId>
+
+    <name>VID Deliveries</name>
+    <description>ONAP VID Deliveries</description>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <docker.push.registry>${docker_registry}</docker.push.registry>
+        <docker.verbose>true</docker.verbose>
+        <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
+        <docker.latest.tag>${project.version}-latest</docker.latest.tag>
+
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+    </properties>
+
+    <profiles>
+
+        <profile>
+            <id>docker-proxy</id>
+            <!-- activate profile if environment variable `http_proxy` is set -->
+            <activation>
+                <property>
+                    <name>env.http_proxy</name>
+                </property>
+            </activation>
+            <properties>
+                <docker.buildArg.http_proxy>${env.http_proxy}</docker.buildArg.http_proxy>
+            </properties>
+        </profile>
+
+    </profiles>
+
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.28.0</version>
+
+                <configuration>
+                    <verbose>true</verbose>
+                    <apiVersion>1.23</apiVersion>
+                    <images>
+                        <image>
+                            <name>onap/vid:${project.version}</name>
+                            <build>
+                                <cleanup>remove</cleanup>
+                                <dockerFileDir>docker-files</dockerFileDir>
+                                <assembly>
+                                    <basedir>/</basedir>
+                                    <user>vidadmin:vidadmin:vidadmin</user>
+                                    <descriptor>assembly/assembly-for-plugin.xml</descriptor>
+                                </assembly>
+                                <tags>
+                                    <tag>4.0-STAGING-latest</tag>
+                                    <tag>latest</tag>
+                                    <tag>${docker.tag}</tag>
+                                    <tag>${docker.latest.tag}</tag>
+                                </tags>
+
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>generate-image</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
+                        <id>push-image</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
-- 
cgit 1.2.3-korg