diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index e7397f8..5d894e3 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -19,7 +19,7 @@ jobs: id: build-args run: | # Declare vars for internal use - VERSION=$(git describe --abbrev=0 --tags) + VERSION=$(make get_version) GIT_HEAD_COMMIT=$(git rev-parse --short HEAD) GIT_TAG_COMMIT=$(git rev-parse --short $VERSION) GIT_MODIFIED_1=$(git diff $GIT_HEAD_COMMIT $GIT_TAG_COMMIT --quiet && echo "" || echo ".dev") diff --git a/Makefile b/Makefile index fb826e6..7da6683 100644 --- a/Makefile +++ b/Makefile @@ -154,6 +154,10 @@ GIT_MODIFIED ?= $$(echo "$(GIT_MODIFIED_1)$(GIT_MODIFIED_2)") GIT_REPO ?= $$(git config --get remote.origin.url) BUILD_DATE ?= $$(git log -1 --format="%at" | xargs -I{} date -d @{} +%Y-%m-%dT%H:%M:%S) +.PHONY: get_version +get_version: + @echo -n v$(VERSION) + build: generate fmt vet ## Build manager binary. go build -o bin/manager main.go