update go to 1.6.3

Signed-off-by: Jess Frazelle <me@jessfraz.com>
This commit is contained in:
Jess Frazelle 2016-07-18 14:10:12 -04:00
parent f50bb73ed6
commit a333cf429a
7 changed files with 8 additions and 8 deletions

View File

@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about.
FROM golang:1.6.2
FROM golang:1.6.3
ENV GOARM 6
ENV KUBE_DYNAMIC_CROSSPLATFORMS \

View File

@ -1 +1 @@
v1.6.2-2
v1.6.3-0

View File

@ -45,7 +45,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}"
# Constants
readonly KUBE_BUILD_IMAGE_REPO=kube-build
readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.2-2"
readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.3-0"
# KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>"
# Here we map the output directories across both the local and remote _output
@ -173,7 +173,7 @@ function kube::build::docker_available_on_osx() {
kube::log::status "Using Docker for MacOS"
return 0
fi
kube::log::status "No docker host is set. Checking options for setting one..."
if [[ -z "$(which docker-machine)" && -z "$(which boot2docker)" ]]; then
kube::log::status "It looks like you're running Mac OS X, yet none of Docker for Mac, docker-machine or boot2docker are on the path."

View File

@ -61,5 +61,5 @@ docker run --rm=true -i \
-e "WORKSPACE=/workspace" \
${KUBEKINS_SERVICE_ACCOUNT_FILE:+-e "KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"} \
"${docker_extra_args[@]:+${docker_extra_args[@]}}" \
gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev3 \
gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev1 \
bash -c "bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"

View File

@ -44,5 +44,5 @@ docker run --rm=true \
-e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
-e "REPO_DIR=${REPO_DIR}" \
-e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_DIR}" \
-i gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev3 \
-i gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev1 \
bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"

View File

@ -15,7 +15,7 @@
# This file creates a build environment for building and running kubernetes
# unit and integration tests
FROM golang:1.6.2
FROM golang:1.6.3
MAINTAINER Jeff Lowdermilk <jeffml@google.com>
ENV WORKSPACE /workspace

View File

@ -16,7 +16,7 @@ all: push
# Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION
# These versions are specified in the Dockerfile
TAG = go1.6.2-docker1.9.1-rev3
TAG = go1.6.3-docker1.9.1-rev1
container:
docker build -t gcr.io/google_containers/kubekins-test .