RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fix git branch with slash as docker tag
This commit is contained in:
Fabian Reinartz 2016-04-23 15:14:46 +02:00
parent 0647926817 b2292aaa62
commit 9003ee441b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -18,7 +18,7 @@ pkgs = $(shell $(GO) list ./... | grep -v /vendor/)
PREFIX ?= $(shell pwd) PREFIX ?= $(shell pwd)
BIN_DIR ?= $(shell pwd) BIN_DIR ?= $(shell pwd)
DOCKER_IMAGE_NAME ?= prometheus 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 ifdef DEBUG
bindata_flags = -debug bindata_flags = -debug