diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index 0c13292cfb5..2c7aec432ec 100644 --- a/build/build-image/cross/Dockerfile +++ b/build/build-image/cross/Dockerfile @@ -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.0 +FROM golang:1.6.2 ENV GOARM 6 ENV KUBE_DYNAMIC_CROSSPLATFORMS \ diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 4a3c1249b64..ae6fa32e6a4 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.6.0-2 +v1.6.2-1 diff --git a/hack/jenkins/dockerized-e2e-runner.sh b/hack/jenkins/dockerized-e2e-runner.sh index 8c75a923977..d70c00aa832 100755 --- a/hack/jenkins/dockerized-e2e-runner.sh +++ b/hack/jenkins/dockerized-e2e-runner.sh @@ -38,5 +38,5 @@ docker run --rm=true -i \ -e "HOME=/workspace" \ -e "WORKSPACE=/workspace" \ "${METADATA_SERVER_ADD_HOST_ARGS[@]:+${METADATA_SERVER_ADD_HOST_ARGS[@]}}" \ - gcr.io/google_containers/kubekins-test:0.9 \ + gcr.io/google_containers/kubekins-test:0.11 \ bash -c "bash <(curl -fsS --retry 3 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')" diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh index 2ea9ecf5418..6b1e63fe76b 100755 --- a/hack/jenkins/gotest-dockerized.sh +++ b/hack/jenkins/gotest-dockerized.sh @@ -45,5 +45,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:0.9 \ + -i gcr.io/google_containers/kubekins-test:0.11 \ bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh" diff --git a/hack/jenkins/test-image/Dockerfile b/hack/jenkins/test-image/Dockerfile index f930d8b04dc..48d5d745f6c 100644 --- a/hack/jenkins/test-image/Dockerfile +++ b/hack/jenkins/test-image/Dockerfile @@ -15,7 +15,7 @@ # This file creates a build environment for building and running kubernetes # unit and integration tests -FROM golang:1.6 +FROM golang:1.6.2 MAINTAINER Jeff Lowdermilk ENV WORKSPACE /workspace diff --git a/hack/jenkins/test-image/Makefile b/hack/jenkins/test-image/Makefile index 472e9118c91..21a4cac85b2 100644 --- a/hack/jenkins/test-image/Makefile +++ b/hack/jenkins/test-image/Makefile @@ -14,7 +14,7 @@ all: push -TAG = 0.9 +TAG = 0.11 container: docker build -t gcr.io/google_containers/kubekins-test .