github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Have build/make-cross.sh copy binaries back over if using boot2docker.

Browse Source 
Also clarified error message in cluster/kubecfg.sh.
This commit is contained in:
Joe Beda 2014-10-11 07:24:12 -07:00
parent 695fbee343
commit b2395c76f2
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/make-binaries.sh
View File

@ -28,3 +28,4 @@ source "$KUBE_ROOT/build/common.sh"
kube::build::verify_prereqs kube::build::verify_prereqs
kube::build::build_image kube::build::build_image
kube::build::run_build_command build/build-image/make-binaries.sh "$@" kube::build::run_build_command build/build-image/make-binaries.sh "$@"
kube::build::copy_output

1
build/make-cross.sh
View File

@ -29,3 +29,4 @@ source "$KUBE_ROOT/build/common.sh"
kube::build::verify_prereqs kube::build::verify_prereqs
kube::build::build_image kube::build::build_image
kube::build::run_build_command build/build-image/make-cross.sh kube::build::run_build_command build/build-image/make-cross.sh
kube::build::copy_output

17
cluster/kubecfg.sh
View File

@ -62,13 +62,18 @@ kubecfg="${KUBE_ROOT}/_output/build/${host_os}/${host_arch}/kubecfg"
if [[ ! -x "$kubecfg" ]]; then if [[ ! -x "$kubecfg" ]]; then
kubecfg="${KUBE_ROOT}/platforms/${host_os}/${host_arch}/kubecfg" kubecfg="${KUBE_ROOT}/platforms/${host_os}/${host_arch}/kubecfg"
fi fi
if [[ ! -x "$kubecfg" ]]; then if [[ ! -x "$kubecfg" ]]; then
echo "It looks as if you don't have a compiled version of Kubernetes. If you" >&2 {
echo "are running from a clone of the git repo, please run ./build/make-cross.sh." >&2 echo "It looks as if you don't have a compiled kubecfg binary."
echo "Note that this requires having Docker installed. If you are running " >&2 echo
echo "from a release tarball, something is wrong. Look at " >&2 echo "If you are running from a clone of the git repo, please run"
echo "http://kubernetes.io/ for information on how to contact the " echo "'./build/make-cross.sh'. Note that this requires having Docker installed."
echo "development team for help." >&2 echo
echo "If you are running from a binary release tarball, something is wrong. "
echo "Look at http://kubernetes.io/ for information on how to contact the "
echo "development team for help."
} >&2
exit 1 exit 1
fi fi