From 66d33ac6d35f8ec066a1fff1fa1b423dd214ac0d Mon Sep 17 00:00:00 2001 From: Akram Ben Aissi Date: Thu, 7 May 2020 10:20:55 +0200 Subject: [PATCH 1/2] Makefile complains about minikube not found when running inside docker --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f3741273..97a45bd6 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ PACKAGES_FOR_UNIT_TESTS = $(shell go list -f '{{.ImportPath}}/' ./... | grep -v # Run all the e2e tests by default E2E_TEST_SELECTOR ?= .* -JENKINS_API_HOSTNAME := $(shell $(JENKINS_API_HOSTNAME_COMMAND)) +JENKINS_API_HOSTNAME := $(shell $(JENKINS_API_HOSTNAME_COMMAND) 2> /dev/null || echo 127.0.0.1 ) OPERATOR_ARGS ?= --jenkins-api-hostname=$(JENKINS_API_HOSTNAME) --jenkins-api-port=$(JENKINS_API_PORT) --jenkins-api-use-nodeport=$(JENKINS_API_USE_NODEPORT) $(OPERATOR_EXTRA_ARGS) .DEFAULT_GOAL := help @@ -513,4 +513,4 @@ helm-deploy: helm-package generate-docs: ## Re-generate docs directory from the website directory @echo "+ $@" rm -rf docs || echo "Cannot remove docs dir, ignoring" - hugo -s website -d ../docs \ No newline at end of file + hugo -s website -d ../docs From 35b5bfde7a30a80941b412b40c68ff35b05a7ad2 Mon Sep 17 00:00:00 2001 From: Akram Ben Aissi Date: Tue, 12 May 2020 18:21:10 +0200 Subject: [PATCH 2/2] Update Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Tomasz Sęk <31410181+tomaszsek@users.noreply.github.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 97a45bd6..b569b8ce 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ PACKAGES_FOR_UNIT_TESTS = $(shell go list -f '{{.ImportPath}}/' ./... | grep -v # Run all the e2e tests by default E2E_TEST_SELECTOR ?= .* -JENKINS_API_HOSTNAME := $(shell $(JENKINS_API_HOSTNAME_COMMAND) 2> /dev/null || echo 127.0.0.1 ) +JENKINS_API_HOSTNAME := $(shell $(JENKINS_API_HOSTNAME_COMMAND) 2> /dev/null || echo "" ) OPERATOR_ARGS ?= --jenkins-api-hostname=$(JENKINS_API_HOSTNAME) --jenkins-api-port=$(JENKINS_API_PORT) --jenkins-api-use-nodeport=$(JENKINS_API_USE_NODEPORT) $(OPERATOR_EXTRA_ARGS) .DEFAULT_GOAL := help