From fd35a4c990c048a5a9fa00cb3025f43f98e8a778 Mon Sep 17 00:00:00 2001 From: Tang Cheng Date: Thu, 24 Oct 2019 17:18:37 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E8=AF=91release?= =?utf8?q?=E7=89=88=E6=9C=ACdocker=20tag=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + Makefile | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) 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) -- 2.17.1