diff --git a/Makefile b/Makefile index 2a9137a..d981c3b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ .DEFAULT_GOAL := build +VERSION ?= $(shell ./hack/get-version.sh) + .PHONY:fmt vet build fmt: go fmt ./... @@ -11,7 +13,7 @@ build: vet go build build-docker: vet - docker build -t numberly/vault-db-injector:2.0.1 . + docker build -t numberly/vault-db-injector:${VERSION} . push-docker: build-docker - docker push numberly/vault-db-injector:2.0.1 \ No newline at end of file + docker push numberly/vault-db-injector:${VERSION} diff --git a/hack/get-version.sh b/hack/get-version.sh new file mode 100644 index 0000000..ad2021c --- /dev/null +++ b/hack/get-version.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +# Copyright 2022 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if [[ "${GIT_TAG}" == "" ]]; then + GIT_TAG="$(git describe --tags --dirty --always)" +fi + +# The value passed by gcr's cloudbuild will have this prefix by default +# https://github.com/kubernetes/k8s.io/blob/aa5a1f164aece8f116196c40ac7b937be479cd41/images/codesearch/cs-fetch-repos/Makefile#L19 +if [[ "${GIT_TAG}" =~ ^v[0-9]{8}- ]]; then + GIT_TAG="${GIT_TAG:10}" +fi + +echo "${GIT_TAG}"