diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index f411262b54..551133c3ec 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.7.4 +FROM golang:1.7.5 ENV GOARM 7 ENV KUBE_DYNAMIC_CROSSPLATFORMS \ diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 4f6aca067e..0db7118eb5 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.7.4-2 +v1.7.5-1 diff --git a/build/cni/Makefile b/build/cni/Makefile index fdb203538f..30c590ceb9 100644 --- a/build/cni/Makefile +++ b/build/cni/Makefile @@ -22,7 +22,7 @@ CNI_RELEASE?=07a8a28637e97b22eb8dfe710eeae1344f69d16e CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz CUR_DIR=$(shell pwd) OUTPUT_DIR=$(CUR_DIR)/output -GOLANG_VERSION=1.7.4 +GOLANG_VERSION=1.7.5 all: build diff --git a/cluster/images/etcd-version-monitor/Makefile b/cluster/images/etcd-version-monitor/Makefile index abb1e32f0b..5578e3d776 100644 --- a/cluster/images/etcd-version-monitor/Makefile +++ b/cluster/images/etcd-version-monitor/Makefile @@ -15,10 +15,10 @@ # Build the etcd-version-monitor image # # Usage: -# [GOLANG_VERSION=1.7.4] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push) +# [GOLANG_VERSION=1.7.5] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push) # TODO(shyamjvs): Support architectures other than amd64 if needed. ARCH:=amd64 -GOLANG_VERSION?=1.7.4 +GOLANG_VERSION?=1.7.5 REGISTRY?=gcr.io/google-containers TAG?=0.1.0 IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG) diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index e6edfb73a8..90c30d85e7 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -30,7 +30,7 @@ TAGS?=2.2.1 2.3.7 3.0.14 REGISTRY_TAG?=3.0.14 ARCH?=amd64 REGISTRY?=gcr.io/google_containers -GOLANG_VERSION?=1.7.4 +GOLANG_VERSION?=1.7.5 GOARM=7 TEMP_DIR:=$(shell mktemp -d) diff --git a/test/images/serve_hostname/Makefile b/test/images/serve_hostname/Makefile index 0ec23b5777..e69d442cce 100644 --- a/test/images/serve_hostname/Makefile +++ b/test/images/serve_hostname/Makefile @@ -31,7 +31,7 @@ ALL_ARCH = amd64 arm arm64 ppc64le s390x GOARM=7 TEMP_DIR := $(shell mktemp -d) -GOLANG_VERSION=1.7.4 +GOLANG_VERSION=1.7.5 BIN = serve_hostname SRCS = serve_hostname.go