From 29c4fd6bb3dfc3531edf1e60e1af75073d800fdb Mon Sep 17 00:00:00 2001 From: Johan Euphrosine Date: Wed, 22 Oct 2014 16:52:20 -0700 Subject: [PATCH] build: add KUBE_BUILD_GOLANG_VERSION --- build/common.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/common.sh b/build/common.sh index d6a07523830..327d4e210d7 100644 --- a/build/common.sh +++ b/build/common.sh @@ -48,6 +48,7 @@ readonly KUBE_BUILD_IMAGE_REPO=kube-build # KUBE_BUILD_CONTAINER_NAME=kube-build- readonly KUBE_BUILD_IMAGE_CROSS_TAG=cross readonly KUBE_BUILD_IMAGE_CROSS="${KUBE_BUILD_IMAGE_REPO}:${KUBE_BUILD_IMAGE_CROSS_TAG}" +readonly KUBE_BUILD_GOLANG_VERSION=1.3 readonly KUBE_GO_PACKAGE="github.com/GoogleCloudPlatform/kubernetes" @@ -225,7 +226,7 @@ function kube::build::build_image_built() { function kube::build::ensure_golang() { kube::build::docker_image_exists golang 1.3 || { [[ ${KUBE_SKIP_CONFIRMATIONS} =~ ^[yY]$ ]] || { - echo "You don't have a local copy of the golang docker image. This image is 450GB." + echo "You don't have a local copy of the golang docker image. This image is 450MB." read -p "Download it now? [y/n] " -n 1 -r echo [[ $REPLY =~ ^[yY]$ ]] || { @@ -234,8 +235,8 @@ function kube::build::ensure_golang() { } } - echo "+++ Pulling docker image: golang:1.3" - docker pull golang:1.3 + echo "+++ Pulling docker image: golang:${KUBE_BUILD_GOLANG_VERSION}" + docker pull golang:${KUBE_BUILD_GOLANG_VERSION} } }