Merge pull request #37945 from kad/golang174

Automatic merge from submit-queue (batch tested with PRs 37945, 37498, 37391, 37209, 37169)

Use Go 1.7.4 due to security fixes

**What this PR does / why we need it**: Golang released 1.7.4 with few security fixes.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:
```release-note
- bump Go compiler to 1.7.4
```
This commit is contained in:
Kubernetes Submit Queue 2016-12-02 20:32:43 -08:00 committed by GitHub
commit 91e02fe2ec
2 changed files with 3 additions and 3 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.7.3
FROM golang:1.7.4
ENV GOARM 6
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
@ -78,7 +78,7 @@ RUN export ETCD_VERSION=v3.0.14; \
&& ln -s ../src/etcd/etcd-${ETCD_VERSION}-linux-amd64/etcd /usr/local/bin/
# TODO: Remove the patched GOROOT when we have an official golang that has a working arm and ppc64le linker
ENV K8S_PATCHED_GOLANG_VERSION=1.7.1 \
ENV K8S_PATCHED_GOLANG_VERSION=1.7.4 \
K8S_PATCHED_GOROOT=/usr/local/go_k8s_patched
RUN mkdir -p ${K8S_PATCHED_GOROOT} \
&& curl -sSL https://github.com/golang/go/archive/go${K8S_PATCHED_GOLANG_VERSION}.tar.gz | tar -xz -C ${K8S_PATCHED_GOROOT} --strip-components=1

View File

@ -1 +1 @@
v1.7.3-1
v1.7.4-0