From 20b34412dc8a3099f658545e8504e1fc1326b3cb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 23 Jan 2019 23:44:34 +0100 Subject: [PATCH] Bump Golang 1.11.5 (CVE-2019-6486) See the milestone for details; https://github.com/golang/go/issues?q=milestone%3AGo1.11.5+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- Dockerfile.e2e | 2 +- Dockerfile.simple | 2 +- Dockerfile.windows | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4844f9fb1a..b4b9a40c39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ # the case. Therefore, you don't have to disable it anymore. # -FROM golang:1.11.4 AS base +FROM golang:1.11.5 AS base # allow replacing httpredir or deb mirror ARG APT_MIRROR=deb.debian.org RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 6570214a80..3d06b97ac4 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,5 +1,5 @@ ## Step 1: Build tests -FROM golang:1.11.4-alpine3.8 as builder +FROM golang:1.11.5-alpine3.8 as builder RUN apk --no-cache add \ bash \ diff --git a/Dockerfile.simple b/Dockerfile.simple index 2ba2d1a44d..3ea2468f4f 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -5,7 +5,7 @@ # This represents the bare minimum required to build and test Docker. -FROM golang:1.11.4-stretch +FROM golang:1.11.5-stretch # allow replacing httpredir or deb mirror ARG APT_MIRROR=deb.debian.org diff --git a/Dockerfile.windows b/Dockerfile.windows index 0412f88660..18362550a1 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # Environment variable notes: # - GO_VERSION must be consistent with 'Dockerfile' used by Linux. # - FROM_DOCKERFILE is used for detection of building within a container. -ENV GO_VERSION=1.11.4 ` +ENV GO_VERSION=1.11.5 ` GIT_VERSION=2.11.1 ` GOPATH=C:\go ` FROM_DOCKERFILE=1