From 20b53b51e230fe9e78c628841f80b23898a066de Mon Sep 17 00:00:00 2001 From: Tang Cheng Date: Thu, 25 Jul 2019 09:35:41 +0800 Subject: [PATCH] =?utf8?q?=E6=94=B9=E8=BF=9Bdocker=20image=20=E7=89=88?= =?utf8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- payapi/build.gradle | 4 ++-- ynrcc-agent/build.gradle | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) 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 } -- 2.17.1