do not require go for building
This commit is contained in:
parent
7627757081
commit
4428e6e75e
2 changed files with 9 additions and 5 deletions
9
Makefile
9
Makefile
|
@ -15,10 +15,6 @@
|
||||||
# Add the following 'help' target to your Makefile
|
# Add the following 'help' target to your Makefile
|
||||||
# And add help text after each target name starting with '\#\#'
|
# And add help text after each target name starting with '\#\#'
|
||||||
|
|
||||||
ifeq ($(shell which go >/dev/null 2>&1; echo $$?), 1)
|
|
||||||
$(error Can't find 'go' in PATH, please fix and retry. See http://golang.org/doc/install for installation instructions.)
|
|
||||||
endif
|
|
||||||
|
|
||||||
.DEFAULT_GOAL:=help
|
.DEFAULT_GOAL:=help
|
||||||
|
|
||||||
.EXPORT_ALL_VARIABLES:
|
.EXPORT_ALL_VARIABLES:
|
||||||
|
@ -274,7 +270,12 @@ run-ingress-controller: ## Run the ingress controller locally using a kubectl pr
|
||||||
|
|
||||||
.PHONY: check-go-version
|
.PHONY: check-go-version
|
||||||
check-go-version:
|
check-go-version:
|
||||||
|
ifeq ($(USE_DOCKER), true)
|
||||||
|
@build/run-in-docker.sh \
|
||||||
|
hack/check-go-version.sh
|
||||||
|
else
|
||||||
@hack/check-go-version.sh
|
@hack/check-go-version.sh
|
||||||
|
endif
|
||||||
|
|
||||||
.PHONY: init-docker-buildx
|
.PHONY: init-docker-buildx
|
||||||
init-docker-buildx:
|
init-docker-buildx:
|
||||||
|
|
|
@ -43,7 +43,10 @@ KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd -P)
|
||||||
FLAGS=$@
|
FLAGS=$@
|
||||||
|
|
||||||
PKG=k8s.io/ingress-nginx
|
PKG=k8s.io/ingress-nginx
|
||||||
|
ARCH=${ARCH:-}
|
||||||
|
if [[ -z "$ARCH" ]]; then
|
||||||
ARCH=$(go env GOARCH)
|
ARCH=$(go env GOARCH)
|
||||||
|
fi
|
||||||
|
|
||||||
# create output directory as current user to avoid problem with docker.
|
# create output directory as current user to avoid problem with docker.
|
||||||
mkdir -p "${KUBE_ROOT}/bin" "${KUBE_ROOT}/bin/${ARCH}"
|
mkdir -p "${KUBE_ROOT}/bin" "${KUBE_ROOT}/bin/${ARCH}"
|
||||||
|
|
Loading…
Reference in a new issue