diff options
| author | PrometheusBot <prometheus-team@googlegroups.com> | 2019-06-07 07:35:51 +0100 |
|---|---|---|
| committer | Ben Kochie <superq@gmail.com> | 2019-06-07 08:35:51 +0200 |
| commit | b5565922170dae938de7a27ffa7351afea95b67c (patch) | |
| tree | 6ba73c485d155c8c1076a7adc0cddb10bcb5f553 /Makefile.common | |
| parent | 03f0b4db9fc49f0c888d469ed142ed89233f08c3 (diff) | |
| download | prometheus_node_collector-b5565922170dae938de7a27ffa7351afea95b67c.tar.bz2 prometheus_node_collector-b5565922170dae938de7a27ffa7351afea95b67c.tar.xz prometheus_node_collector-b5565922170dae938de7a27ffa7351afea95b67c.zip | |
makefile: update Makefile.common with newer version (#1371)
Signed-off-by: prombot <prometheus-team@googlegroups.com>
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common index c7f9ea6..6b94f83 100644 --- a/Makefile.common +++ b/Makefile.common | |||
| @@ -86,6 +86,7 @@ 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 | DOCKER_REPO ?= prom | 90 | DOCKER_REPO ?= prom |
| 90 | 91 | ||
| 91 | DOCKER_ARCHS ?= amd64 | 92 | DOCKER_ARCHS ?= amd64 |
| @@ -212,7 +213,7 @@ $(BUILD_DOCKER_ARCHS): common-docker-%: | |||
| 212 | docker build -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" \ | 213 | docker build -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" \ |
| 213 | --build-arg ARCH="$*" \ | 214 | --build-arg ARCH="$*" \ |
| 214 | --build-arg OS="linux" \ | 215 | --build-arg OS="linux" \ |
| 215 | . | 216 | $(DOCKERFILE_PATH) |
| 216 | 217 | ||
| 217 | .PHONY: common-docker-publish $(PUBLISH_DOCKER_ARCHS) | 218 | .PHONY: common-docker-publish $(PUBLISH_DOCKER_ARCHS) |
| 218 | common-docker-publish: $(PUBLISH_DOCKER_ARCHS) | 219 | common-docker-publish: $(PUBLISH_DOCKER_ARCHS) |