Skip to content

Commit

Permalink
Merge pull request #230 from prometheus/makefile_common
Browse files Browse the repository at this point in the history
Synchronize Makefile.common from prometheus/prometheus
  • Loading branch information
Matthias Rampke authored Jun 7, 2019
2 parents 59056c0 + 1d21cdc commit 95e376a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ endif
PREFIX ?= $(shell pwd)
BIN_DIR ?= $(shell pwd)
DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
DOCKERFILE_PATH ?= ./
DOCKER_REPO ?= prom

DOCKER_ARCHS ?= amd64
Expand Down Expand Up @@ -212,7 +213,7 @@ $(BUILD_DOCKER_ARCHS): common-docker-%:
docker build -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" \
--build-arg ARCH="$*" \
--build-arg OS="linux" \
.
$(DOCKERFILE_PATH)

.PHONY: common-docker-publish $(PUBLISH_DOCKER_ARCHS)
common-docker-publish: $(PUBLISH_DOCKER_ARCHS)
Expand Down

0 comments on commit 95e376a

Please sign in to comment.