p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump Golang 1.11.5 (CVE-2019-6486)

Browse Source 
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>
(cherry picked from commit 20b34412dc8a3099f658545e8504e1fc1326b3cb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4add22cc49057ec58284ba12afbf5a7c3c290805
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2019-01-23 23:44:34 +01:00
parent 3835dde0f7
commit bd129e88cf
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/Dockerfile
View File

@ -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

2
components/engine/Dockerfile.e2e
View File

@ -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 add --update \
bash \

2
components/engine/Dockerfile.simple
View File

@ -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

2
components/engine/Dockerfile.windows
View File

@ -161,7 +161,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