diff options
| author | PrometheusBot <prometheus-team@googlegroups.com> | 2019-06-24 13:01:45 +0200 |
|---|---|---|
| committer | Ben Kochie <superq@gmail.com> | 2019-06-24 13:01:45 +0200 |
| commit | 76a37a6816fe847ce795ce66f96a08b94aad4b7f (patch) | |
| tree | d18d1fe849ed4809085f099f5046e802a9e115fe /Makefile.common | |
| parent | e57f05aace229e508e294420f5ffc4649e26ed71 (diff) | |
| download | prometheus_node_collector-76a37a6816fe847ce795ce66f96a08b94aad4b7f.tar.bz2 prometheus_node_collector-76a37a6816fe847ce795ce66f96a08b94aad4b7f.tar.xz prometheus_node_collector-76a37a6816fe847ce795ce66f96a08b94aad4b7f.zip | |
makefile: update Makefile.common with newer version (#1390)
Signed-off-by: prombot <prometheus-team@googlegroups.com>
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.common b/Makefile.common index d7aea1b..2dcf764 100644 --- a/Makefile.common +++ b/Makefile.common | |||
| @@ -86,7 +86,8 @@ endif | |||
| 86 | PREFIX ?= $(shell pwd) | 86 | PREFIX ?= $(shell pwd) |
| 87 | BIN_DIR ?= $(shell pwd) | 87 | BIN_DIR ?= $(shell pwd) |
| 88 | DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD)) | 88 | DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD)) |
| 89 | DOCKERFILE_PATH ?= ./ | 89 | DOCKERFILE_PATH ?= ./Dockerfile |
| 90 | DOCKERBUILD_CONTEXT ?= ./ | ||
| 90 | DOCKER_REPO ?= prom | 91 | DOCKER_REPO ?= prom |
| 91 | 92 | ||
| 92 | DOCKER_ARCHS ?= amd64 | 93 | DOCKER_ARCHS ?= amd64 |
| @@ -211,9 +212,10 @@ common-tarball: promu | |||
| 211 | common-docker: $(BUILD_DOCKER_ARCHS) | 212 | common-docker: $(BUILD_DOCKER_ARCHS) |
| 212 | $(BUILD_DOCKER_ARCHS): common-docker-%: | 213 | $(BUILD_DOCKER_ARCHS): common-docker-%: |
| 213 | docker build -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" \ | 214 | docker build -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" \ |
| 215 | -f $(DOCKERFILE_PATH) \ | ||
| 214 | --build-arg ARCH="$*" \ | 216 | --build-arg ARCH="$*" \ |
| 215 | --build-arg OS="linux" \ | 217 | --build-arg OS="linux" \ |
| 216 | $(DOCKERFILE_PATH) | 218 | $(DOCKERBUILD_CONTEXT) |
| 217 | 219 | ||
| 218 | .PHONY: common-docker-publish $(PUBLISH_DOCKER_ARCHS) | 220 | .PHONY: common-docker-publish $(PUBLISH_DOCKER_ARCHS) |
| 219 | common-docker-publish: $(PUBLISH_DOCKER_ARCHS) | 221 | common-docker-publish: $(PUBLISH_DOCKER_ARCHS) |