Merge pull request #1577 from sdurrheimer/fix-git-branch-with-slash-as-docker-tag

Fix git branch with slash as docker tag
2016-04-23 15:14:46 +02:00 · 2016-04-23 15:14:46 +02:00 · 9003ee441b
parent 0647926817 b2292aaa62
commit 9003ee441b
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -18,7 +18,7 @@ pkgs   = $(shell $(GO) list ./... | grep -v /vendor/)
 PREFIX                  ?= $(shell pwd)
 BIN_DIR                 ?= $(shell pwd)
 DOCKER_IMAGE_NAME       ?= prometheus
-DOCKER_IMAGE_TAG        ?= $(shell git rev-parse --abbrev-ref HEAD)
+DOCKER_IMAGE_TAG        ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))

 ifdef DEBUG
 	bindata_flags = -debug