public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #371 from akram/do-not-warn-if-minikube-missing 

Makefile complains about minikube not found when running inside docker
This commit is contained in:
Tomasz Sęk 2020-05-13 09:50:52 +02:00 committed by GitHub
parent ea671d5621 35b5bfde7a
commit c243b1a8bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
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 "" )
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