From dd827035929ebab862ef52756ea9668900f4683f Mon Sep 17 00:00:00 2001
From: Alexander Kanevskiy <alexander.kanevskiy@intel.com>
Date: Fri, 2 Dec 2016 14:12:17 +0200
Subject: [PATCH] Use Go 1.7.4 due to security fixes

---
 build-tools/build-image/cross/Dockerfile | 4 ++--
 build-tools/build-image/cross/VERSION    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-tools/build-image/cross/Dockerfile b/build-tools/build-image/cross/Dockerfile
index 5e803de83d4..46aae4a0acf 100644
--- a/build-tools/build-image/cross/Dockerfile
+++ b/build-tools/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.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
diff --git a/build-tools/build-image/cross/VERSION b/build-tools/build-image/cross/VERSION
index 663f07ff88c..47370f02d22 100644
--- a/build-tools/build-image/cross/VERSION
+++ b/build-tools/build-image/cross/VERSION
@@ -1 +1 @@
-v1.7.3-1
+v1.7.4-0