Modified the Docker Tagging

Change-Id: Ib9792a7b893bb8cc2c7a1771afdd3ad385e37226
Issue-ID: HOLMES-179
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml
index 8cc3471..a46a94d 100644 (file)
--- a/rulemgt-standalone/pom.xml
+++ b/rulemgt-standalone/pom.xml
@@ -251,6 +251,7 @@
                                 }
 
                                 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'];
@@ -282,8 +283,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>