From 6cf82357a304a8e35c2aecc64a45b29c9f48b1bc Mon Sep 17 00:00:00 2001 From: antoniaklja Date: Wed, 19 Dec 2018 22:50:39 +0100 Subject: [PATCH] Fixed e2e docker build issue --- Makefile | 6 ++++++ doc/developer-guide.md | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c29f0e36..7b097eaa 100644 --- a/Makefile +++ b/Makefile @@ -261,6 +261,12 @@ docker-build: check-env ## Build the container @echo "+ $@" docker build . -t $(REPO):$(GITCOMMIT) --file build/Dockerfile +.PHONY: docker-build-e2e +docker-build-e2e: check-env ## Build the container for e2e tests + @echo "+ $@" + eval $(minikube docker-env) + docker build . -t $(REPO):$(GITCOMMIT) --file build/Dockerfile + .PHONY: docker-images docker-images: ## List all local containers @echo "+ $@" diff --git a/doc/developer-guide.md b/doc/developer-guide.md index bece5068..a8d1f732 100644 --- a/doc/developer-guide.md +++ b/doc/developer-guide.md @@ -48,8 +48,7 @@ Run e2e tests with minikube: ```bash make minikube-run -eval $(minikube docker-env) -make docker-build +make docker-build-e2e make e2e E2E_IMAGE=jenkins-operator ```