From ca2fa4684b53d3021ce6f8c98886a1c93767000d Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Mon, 23 Jul 2018 10:56:20 +0200 Subject: [PATCH] Fix docker build (#1016) Fix override of make docker target to include new `DOCKER_REPO` variable pattern. Signed-off-by: Ben Kochie --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 15549545..6cd5e0f6 100644 --- a/Makefile +++ b/Makefile @@ -110,12 +110,12 @@ ifeq ($(MACH), ppc64le) $(eval DOCKERFILE=Dockerfile.ppc64le) endif @echo ">> building docker image from $(DOCKERFILE)" - @docker build --file $(DOCKERFILE) -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" . + @docker build --file $(DOCKERFILE) -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" . .PHONY: test-docker test-docker: @echo ">> testing docker image" - ./test_image.sh "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" 9100 + ./test_image.sh "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" 9100 .PHONY: promtool $(FIRST_GOPATH)/bin/promtool $(FIRST_GOPATH)/bin/promtool promtool: