Modified the Docker Tagging

[holmes/engine-management.git] / engine-d-standalone / pom.xml

diff --git a/engine-d-standalone/pom.xml b/engine-d-standalone/pom.xml
index 84a3970..00c83df 100644 (file)
--- a/engine-d-standalone/pom.xml
+++ b/engine-d-standalone/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.holmes.engine-management</groupId>
         <artifactId>holmes-engine-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>holmes-engine-d-standalone</artifactId>
@@ -32,7 +32,7 @@
 
     <properties>
        <holmes.engine.project.version>${project.version}</holmes.engine.project.version>
-       <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
+       <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <build.number>${maven.build.timestamp}</build.number>
     </properties>
 
@@ -209,10 +209,11 @@
                                 println project.properties['holmes.engine.project.version'];
                                 def versionArray;
                                 if ( project.properties['holmes.engine.project.version'] != null ) {
-                                    versionArray = project.properties['holmes.engine.project.version'].split('\\.');
+                                    versionArray = project.properties['holmes.engine.project.version'].split('-');
                                 }
 
-                                                               project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
+                                project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
+                                project.properties['project.docker.latesttag.version.with.timestamp'] = versionArray[0] + "-STAGING-${build.number}";
 
                                 println 'New Tag for docker:' +
                                 project.properties['project.docker.latesttag.version'];
@@ -244,8 +245,9 @@
                                         <dockerFile>${basedir}/target/version/Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.version}</tag>
-                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.version}-${build.number}</tag>
                                             <tag>${project.docker.latesttag.version}</tag>
+                                            <tag>${project.docker.latesttag.version.with.timestamp}</tag>
                                         </tags>
                                     </build>
                                 </image>