改进makefile

diff --git a/Makefile b/Makefile
index f9357b8..ffe6866 100644 (file)
--- 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