From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Thu, 25 Jul 2019 01:35:41 +0000 (+0800)
Subject: 改进docker image 版本信息
X-Git-Tag: 1.0.0^2~1
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=20b53b51e230fe9e78c628841f80b23898a066de;p=epayment%2Ffood_payapi.git

改进docker image 版本信息
---

diff --git a/payapi/build.gradle b/payapi/build.gradle
index 1d6b51af..3e5d865d 100644
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@ -34,12 +34,12 @@ jar {
 
 docker {
     def imageVersion
-    if (details.commitDistance > 0) {
+    if (details.commitDistance > 0 || !details.isCleanTag) {
         imageVersion = 'dev'
     } else {
         imageVersion = details.lastTag
     }
-    name 'harbor.supwisdom.com/dali/payapi:' + version
+    name 'harbor.supwisdom.com/dali/payapi:' + imageVersion
     println(jar.archivePath)
     files jar.archivePath
 }
diff --git a/ynrcc-agent/build.gradle b/ynrcc-agent/build.gradle
index 7f8d1806..20cc9b39 100644
--- a/ynrcc-agent/build.gradle
+++ b/ynrcc-agent/build.gradle
@@ -9,6 +9,7 @@ apply plugin: 'java'
 apply plugin: 'io.spring.dependency-management'
 
 def ynrccVersion = gitVersion()
+def details = versionDetails()
 
 group = rootProject.group
 version = '1'
@@ -29,7 +30,13 @@ jar {
 }
 
 docker {
-    name 'harbor.supwisdom.com/dali/ynrcc:' + version
+    def imageVersion
+    if(details.commitDistance > 0 || !details.isCleanTag) {
+        imageVersion = 'dev'
+    } else {
+        imageVersion = details.lastTag
+    }
+    name 'harbor.supwisdom.com/dali/ynrcc:' + imageVersion
     println(jar.archivePath)
     files jar.archivePath
 }