diff options
| author | Ben Kochie <superq@gmail.com> | 2018-07-23 10:56:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 10:56:20 +0200 |
| commit | ca2fa4684b53d3021ce6f8c98886a1c93767000d (patch) | |
| tree | 8c000762d7e80e0464f0fda32a7860b1f2d1a5d3 /Makefile | |
| parent | 981de58fadfb50c688a274d01e7a382919b4c19a (diff) | |
| download | prometheus_node_collector-ca2fa4684b53d3021ce6f8c98886a1c93767000d.tar.bz2 prometheus_node_collector-ca2fa4684b53d3021ce6f8c98886a1c93767000d.tar.xz prometheus_node_collector-ca2fa4684b53d3021ce6f8c98886a1c93767000d.zip | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -110,12 +110,12 @@ ifeq ($(MACH), ppc64le) | |||
| 110 | $(eval DOCKERFILE=Dockerfile.ppc64le) | 110 | $(eval DOCKERFILE=Dockerfile.ppc64le) |
| 111 | endif | 111 | endif |
| 112 | @echo ">> building docker image from $(DOCKERFILE)" | 112 | @echo ">> building docker image from $(DOCKERFILE)" |
| 113 | @docker build --file $(DOCKERFILE) -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" . | 113 | @docker build --file $(DOCKERFILE) -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" . |
| 114 | 114 | ||
| 115 | .PHONY: test-docker | 115 | .PHONY: test-docker |
| 116 | test-docker: | 116 | test-docker: |
| 117 | @echo ">> testing docker image" | 117 | @echo ">> testing docker image" |
| 118 | ./test_image.sh "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" 9100 | 118 | ./test_image.sh "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" 9100 |
| 119 | 119 | ||
| 120 | .PHONY: promtool $(FIRST_GOPATH)/bin/promtool | 120 | .PHONY: promtool $(FIRST_GOPATH)/bin/promtool |
| 121 | $(FIRST_GOPATH)/bin/promtool promtool: | 121 | $(FIRST_GOPATH)/bin/promtool promtool: |