scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch official builds to go 1.4.

Browse Source 
This fixes #2894
This commit is contained in:
Joe Beda
2015-01-21 11:35:37 -08:00
parent 903de0c2fe
commit a735e2d160
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/Dockerfile
View File

@@ -23,7 +23,7 @@ ENV GOOS linux
ENV GOARCH amd64 ENV GOARCH amd64
# Get the code coverage tool and godep # Get the code coverage tool and godep
RUN go get code.google.com/p/go.tools/cmd/cover github.com/tools/godep RUN go get golang.org/x/tools/cmd/cover github.com/tools/godep
# We use rsync to copy some binaries around. It is faster (0.3s vs. 1.1s) on my # We use rsync to copy some binaries around. It is faster (0.3s vs. 1.1s) on my
# machine vs. `install` # machine vs. `install`

2
build/build-image/cross/Dockerfile
View File

@@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross # This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about. # platform go binary for the architecture kubernetes cares about.
FROM golang:1.3 FROM golang:1.4
MAINTAINER Joe Beda <jbeda@google.com> MAINTAINER Joe Beda <jbeda@google.com>
ENV KUBE_CROSSPLATFORMS \ ENV KUBE_CROSSPLATFORMS \

4
build/common.sh
View File

@@ -51,7 +51,7 @@ readonly KUBE_BUILD_IMAGE_REPO=kube-build
# KUBE_BUILD_CONTAINER_NAME=kube-build-<hash> # KUBE_BUILD_CONTAINER_NAME=kube-build-<hash>
readonly KUBE_BUILD_IMAGE_CROSS_TAG=cross readonly KUBE_BUILD_IMAGE_CROSS_TAG=cross
readonly KUBE_BUILD_IMAGE_CROSS="${KUBE_BUILD_IMAGE_REPO}:${KUBE_BUILD_IMAGE_CROSS_TAG}" readonly KUBE_BUILD_IMAGE_CROSS="${KUBE_BUILD_IMAGE_REPO}:${KUBE_BUILD_IMAGE_CROSS_TAG}"
readonly KUBE_BUILD_GOLANG_VERSION=1.3 readonly KUBE_BUILD_GOLANG_VERSION=1.4
# KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash> # KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>
# Here we map the output directories across both the local and remote _output # Here we map the output directories across both the local and remote _output
@@ -261,7 +261,7 @@ function kube::build::build_image_built() {
} }
function kube::build::ensure_golang() { function kube::build::ensure_golang() {
kube::build::docker_image_exists golang 1.3 || { kube::build::docker_image_exists golang "${KUBE_BUILD_GOLANG_VERSION}" || {
[[ ${KUBE_SKIP_CONFIRMATIONS} =~ ^[yY]$ ]] || { [[ ${KUBE_SKIP_CONFIRMATIONS} =~ ^[yY]$ ]] || {
echo "You don't have a local copy of the golang docker image. This image is 450MB." echo "You don't have a local copy of the golang docker image. This image is 450MB."
read -p "Download it now? [y/n] " -r read -p "Download it now? [y/n] " -r