Merge pull request #813 from SEJeff/patch-1

[Makefile] Allow specifying VERSION as an env var
This commit is contained in:
Eric Chiang 2017-02-23 10:44:25 -08:00 committed by GitHub
commit 58eb25aa60

View File

@ -3,7 +3,7 @@ ORG_PATH=github.com/coreos
REPO_PATH=$(ORG_PATH)/$(PROJ) REPO_PATH=$(ORG_PATH)/$(PROJ)
export PATH := $(PWD)/bin:$(PATH) export PATH := $(PWD)/bin:$(PATH)
VERSION=$(shell ./scripts/git-version) VERSION ?= $(shell ./scripts/git-version)
DOCKER_REPO=quay.io/coreos/dex DOCKER_REPO=quay.io/coreos/dex
DOCKER_IMAGE=$(DOCKER_REPO):$(VERSION) DOCKER_IMAGE=$(DOCKER_REPO):$(VERSION)