From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Thu, 25 Jul 2019 04:44:33 +0000 (+0800)
Subject: 改进makefile
X-Git-Tag: 1.0.1^2~68
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=c7528440530a9754578ea591d2c6e0bba39edd20;p=epayment%2Ffood_payapi.git

改进makefile
---

diff --git a/Makefile b/Makefile
index f9357b87..ffe6866a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,16 @@
 GRADLE=./gradlew
+GIT=git
+
+VERSION=$(shell git describe --tags --abbrev=7 --always)
+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)
+IMAGE_VERSION=dev
+else
+IMAGE_VERSION=$(TAG)
+endif
 
 .PHONY: clean build
 
@@ -16,8 +28,8 @@ docker: build
 	$(GRADLE) ynrcc-agent:docker
 
 push: docker
-	docker push harbor.supwisdom.com/dali/payapi
-	docker push harbor.supwisdom.com/dali/ynrcc
+	docker push harbor.supwisdom.com/dali/payapi:$(IMAGE_VERSION)
+	docker push harbor.supwisdom.com/dali/ynrcc:$(IMAGE_VERSION)
 
 publish: build
 	$(GRADLE) publish