Makefile complains about minikube not found when running inside docker

This commit is contained in:
Akram Ben Aissi 2020-05-07 10:20:55 +02:00
parent 1eeca8ee03
commit 66d33ac6d3
1 changed files with 2 additions and 2 deletions

View File

@ -65,7 +65,7 @@ PACKAGES_FOR_UNIT_TESTS = $(shell go list -f '{{.ImportPath}}/' ./... | grep -v
# Run all the e2e tests by default # Run all the e2e tests by default
E2E_TEST_SELECTOR ?= .* 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) 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 .DEFAULT_GOAL := help
@ -513,4 +513,4 @@ helm-deploy: helm-package
generate-docs: ## Re-generate docs directory from the website directory generate-docs: ## Re-generate docs directory from the website directory
@echo "+ $@" @echo "+ $@"
rm -rf docs || echo "Cannot remove docs dir, ignoring" rm -rf docs || echo "Cannot remove docs dir, ignoring"
hugo -s website -d ../docs hugo -s website -d ../docs