Skip to content
This repository was archived by the owner on Aug 13, 2019. It is now read-only.

Commit d501ae4

Browse files
prombotkrasi-georgiev
authored andcommitted
makefile: update Makefile.common with newer version (#638)
Signed-off-by: prombot <[email protected]>
1 parent 92d1516 commit d501ae4

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Makefile.common

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ endif
8686
PREFIX ?= $(shell pwd)
8787
BIN_DIR ?= $(shell pwd)
8888
DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
89-
DOCKERFILE_PATH ?= ./
89+
DOCKERFILE_PATH ?= ./Dockerfile
90+
DOCKERBUILD_CONTEXT ?= ./
9091
DOCKER_REPO ?= prom
9192

9293
DOCKER_ARCHS ?= amd64
@@ -211,9 +212,10 @@ common-tarball: promu
211212
common-docker: $(BUILD_DOCKER_ARCHS)
212213
$(BUILD_DOCKER_ARCHS): common-docker-%:
213214
docker build -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" \
215+
-f $(DOCKERFILE_PATH) \
214216
--build-arg ARCH="$*" \
215217
--build-arg OS="linux" \
216-
$(DOCKERFILE_PATH)
218+
$(DOCKERBUILD_CONTEXT)
217219

218220
.PHONY: common-docker-publish $(PUBLISH_DOCKER_ARCHS)
219221
common-docker-publish: $(PUBLISH_DOCKER_ARCHS)

0 commit comments

Comments
 (0)