commit a5dd6c0551a3b9d4bc4b52b098f3430dffd2ae61
author Tang Cheng <cheng.tang@supwisdom.com> 周四 7月 25 12:44:33 2019 +0800
committer Xia Kaixiang <kaixiang.xia@supwisdom.com> 周四 10月 24 15:59:47 2019 +0800
tree 5dae166fb785c1bc9bb477c3c955a3641240d81d
parent 3963285a02732b18729df34d0fe088344d07e7ca

改进makefile

Makefile

diff --git a/Makefile b/Makefile
index f9357b8..ffe6866 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 @@
 	$(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