From b988cb672876b1c129c76d60d3ddf7d129ef4bc2 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 25 Sep 2020 15:48:10 +0200
Subject: Standardize docker tagging

Standardize the docker tagging in all maven modules

Issue-ID: SDC-3300
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Id43cbd8efea119d4acf7280b75c30a0275ec3242
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 catalog-be/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'catalog-be')

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index dfe5706cc8..0ee54cbd48 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -18,8 +18,6 @@
         <swagger-ui.version>3.25.0</swagger-ui.version>
         <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
         <replacer.plugin.version>1.5.3</replacer.plugin.version>
-        <docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>
-        <docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>
     </properties>
 
     <dependencies>
@@ -1062,10 +1060,11 @@
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>backend</dockerFileDir>
                                         <tags>
-                                            <tag>${docker.tag}</tag>
+                                            <tag>latest</tag>
                                             <tag>
                                                 ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
                                             </tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
                                         </tags>
                                         <assembly>
                                             <descriptor>backend/backend-files.xml</descriptor>
@@ -1081,10 +1080,11 @@
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${project.basedir}/sdc-backend-init</dockerFileDir>
                                         <tags>
-                                            <tag>${docker.tag}</tag>
+                                            <tag>latest</tag>
                                             <tag>
                                                 ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
                                             </tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
                                         </tags>
                                     </build>
                                 </image>
-- 
cgit 1.2.3-korg