1. docker
  2. Commit 20b34412dc8a3099f658545e8504e1fc1326b3cb
Browse code

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 <github@gone.nl>

Sebastiaan van Stijn authored on 2019/01/24 07:44:34
Showing 4 changed files
Dockerfile
History View file @ 20b3441
... ... 
@@ -24,7 +24,7 @@
24 24 
 # the case. Therefore, you don't have to disable it anymore.
25 25 
 #
26 26
27 
-FROM golang:1.11.4 AS base
27 
+FROM golang:1.11.5 AS base
28 28 
 # allow replacing httpredir or deb mirror
29 29 
 ARG APT_MIRROR=deb.debian.org
30 30 
 RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
Dockerfile.e2e
History View file @ 20b3441
... ... 
@@ -1,5 +1,5 @@
1 1 
 ## Step 1: Build tests
2 
-FROM golang:1.11.4-alpine3.8 as builder
2 
+FROM golang:1.11.5-alpine3.8 as builder
3 3
4 4 
 RUN apk --no-cache add \
5 5 
     bash \
Dockerfile.simple
History View file @ 20b3441
... ... 
@@ -5,7 +5,7 @@
5 5
6 6 
 # This represents the bare minimum required to build and test Docker.
7 7
8 
-FROM golang:1.11.4-stretch
8 
+FROM golang:1.11.5-stretch
9 9
10 10 
 # allow replacing httpredir or deb mirror
11 11 
 ARG APT_MIRROR=deb.debian.org
Dockerfile.windows
History View file @ 20b3441
... ... 
@@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
168 168 
 # Environment variable notes:
169 169 
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
170 170 
 #  - FROM_DOCKERFILE is used for detection of building within a container.
171 
-ENV GO_VERSION=1.11.4 `
171 
+ENV GO_VERSION=1.11.5 `
172 172 
     GIT_VERSION=2.11.1 `
173 173 
     GOPATH=C:\go `
174 174 
     FROM_DOCKERFILE=1