Merge pull request #38 from hmtai/update-build-version

update git version
IBM · Apr 15, 2020 · d283840 · d283840
2 parents 2538936 + cf5a52e
commit d283840
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -31,16 +31,19 @@ IMG ?= ibm-management-ingress-operator
 REGISTRY ?= quay.io/opencloudio
 CSV_VERSION ?= 1.1.0
 
+IMAGE_REPO ?= quay.io/opencloudio
+IMAGE_NAME ?= ibm-management-ingress-operator
+
 QUAY_USERNAME ?=
 QUAY_PASSWORD ?=
 
 MARKDOWN_LINT_WHITELIST=https://quay.io/cnr
 
 TESTARGS_DEFAULT := "-v"
 export TESTARGS ?= $(TESTARGS_DEFAULT)
-VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
+#VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
                  git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
-
+VERSION ?= $(shell date +v%Y%m%d)-$(shell git describe --match=$(git rev-parse --short=8 HEAD) --tags --always --dirty)
 LOCAL_OS := $(shell uname)
 LOCAL_ARCH := $(shell uname -m)
 ifeq ($(LOCAL_OS),Linux)

diff --git a/git b/git