From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Thu, 24 Oct 2019 09:18:37 +0000 (+0800)
Subject: 优化编译release版本docker tag 问题
X-Git-Tag: 1.0.3^2
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=fd35a4c990c048a5a9fa00cb3025f43f98e8a778;p=epayment%2Ffood_payapi.git

优化编译release版本docker tag 问题
---

diff --git a/.gitignore b/.gitignore
index 54c65161..470effd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 HELP.md
 flyway.conf
 .gradle
+.*
 /build/
 !gradle/wrapper/gradle-wrapper.jar
 
diff --git a/Makefile b/Makefile
index ffe6866a..0793a4ce 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,9 @@ TAG=$(shell echo $(VERSION) | awk -F'-' '{print $$1}')
 DISTANCE=$(shell echo $(VERSION) | awk -F'-' '{print $$2}')
 HASH=$(shell echo $(VERSION) | awk -F'-' '{print $$3}')
 
-ifneq ($(DISTANCE), 0)
+ifeq ($(DISTANCE),)
+IMAGE_VERSION=$(TAG)
+else ifneq ($(DISTANCE), 0)
 IMAGE_VERSION=dev
 else
 IMAGE_VERSION=$(TAG)