From 652249c2f0c31fcd43e49326243157fc978d2954 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Tue, 10 Sep 2019 09:16:32 -0400 Subject: [PATCH] Add more go 1.11.5 -> 1.11.13 Adding a few places I missed in #7549 Thanks rifelpet for the heads-up! --- Makefile | 2 +- docker/Dockerfile | 2 +- images/dns-controller-builder/Dockerfile | 2 +- images/protokube-builder/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 97fab71c94912..273c9f29bf6d0 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%) LATEST_FILE?=latest-ci.txt GOPATH_1ST:=$(shell go env | grep GOPATH | cut -f 2 -d \") UNIQUE:=$(shell date +%s) -GOVERSION=1.11.5 +GOVERSION=1.11.13 BUILD=$(GOPATH_1ST)/src/k8s.io/kops/.build LOCAL=$(BUILD)/local BINDATA_TARGETS=upup/models/bindata.go diff --git a/docker/Dockerfile b/docker/Dockerfile index 561586c1ae23f..34c4cda52a524 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ FROM alpine:3.8 -ARG GO_VERSION=1.11.5 +ARG GO_VERSION=1.11.13 # KOPS_GITISH: Modify to build at an explicit tag/gitish ARG KOPS_GITISH=release diff --git a/images/dns-controller-builder/Dockerfile b/images/dns-controller-builder/Dockerfile index 5141c2e967723..fb4064c64a49e 100644 --- a/images/dns-controller-builder/Dockerfile +++ b/images/dns-controller-builder/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \ && rm -rf /var/lib/apt/lists/* # Install golang -RUN curl -L https://storage.googleapis.com/golang/go1.11.5.linux-amd64.tar.gz | tar zx -C /usr/local +RUN curl -L https://storage.googleapis.com/golang/go1.11.13.linux-amd64.tar.gz | tar zx -C /usr/local ENV PATH $PATH:/usr/local/go/bin COPY onbuild.sh /onbuild.sh diff --git a/images/protokube-builder/Dockerfile b/images/protokube-builder/Dockerfile index 5141c2e967723..fb4064c64a49e 100644 --- a/images/protokube-builder/Dockerfile +++ b/images/protokube-builder/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \ && rm -rf /var/lib/apt/lists/* # Install golang -RUN curl -L https://storage.googleapis.com/golang/go1.11.5.linux-amd64.tar.gz | tar zx -C /usr/local +RUN curl -L https://storage.googleapis.com/golang/go1.11.13.linux-amd64.tar.gz | tar zx -C /usr/local ENV PATH $PATH:/usr/local/go/bin COPY onbuild.sh /onbuild.sh