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

Fix docker build (#1016) 

Fix override of make docker target to include new `DOCKER_REPO`
variable pattern.

Signed-off-by: Ben Kochie <superq@gmail.com>
This commit is contained in:
Ben Kochie 2018-07-23 10:56:20 +02:00 committed by GitHub
parent 981de58fad
commit ca2fa4684b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -110,12 +110,12 @@ ifeq ($(MACH), ppc64le)
$(eval DOCKERFILE=Dockerfile.ppc64le) $(eval DOCKERFILE=Dockerfile.ppc64le)
endif endif
@echo ">> building docker image from $(DOCKERFILE)" @echo ">> building docker image from $(DOCKERFILE)"
@docker build --file $(DOCKERFILE) -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" . @docker build --file $(DOCKERFILE) -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" .
.PHONY: test-docker .PHONY: test-docker
test-docker: test-docker:
@echo ">> testing docker image" @echo ">> testing docker image"
./test_image.sh "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" 9100 ./test_image.sh "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" 9100
.PHONY: promtool $(FIRST_GOPATH)/bin/promtool .PHONY: promtool $(FIRST_GOPATH)/bin/promtool
$(FIRST_GOPATH)/bin/promtool promtool: $(FIRST_GOPATH)/bin/promtool promtool: