From 37fd1a0d0a924d73a91e6293907c04dca9377769 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 24 Jan 2019 02:07:03 +0100 Subject: [PATCH] [18.09] Bump Golang 1.10.8 (CVE-2019-6486) See the milestone for details; https://github.com/golang/go/issues?q=milestone%3AGo1.10.8+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn Upstream-commit: c71aa11c0a579d5bc543420449383b9c4944ff51 Component: cli --- components/cli/appveyor.yml | 2 +- components/cli/dockerfiles/Dockerfile.binary-native | 2 +- components/cli/dockerfiles/Dockerfile.cross | 2 +- components/cli/dockerfiles/Dockerfile.dev | 2 +- components/cli/dockerfiles/Dockerfile.e2e | 2 +- components/cli/dockerfiles/Dockerfile.lint | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/cli/appveyor.yml b/components/cli/appveyor.yml index 157628c427..05a4914062 100644 --- a/components/cli/appveyor.yml +++ b/components/cli/appveyor.yml @@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli environment: GOPATH: c:\gopath - GOVERSION: 1.10.6 + GOVERSION: 1.10.8 DEPVERSION: v0.4.1 install: diff --git a/components/cli/dockerfiles/Dockerfile.binary-native b/components/cli/dockerfiles/Dockerfile.binary-native index 6bc86f152f..20f8012a4b 100644 --- a/components/cli/dockerfiles/Dockerfile.binary-native +++ b/components/cli/dockerfiles/Dockerfile.binary-native @@ -1,4 +1,4 @@ -FROM golang:1.10.6-alpine +FROM golang:1.10.8-alpine RUN apk add -U git bash coreutils gcc musl-dev diff --git a/components/cli/dockerfiles/Dockerfile.cross b/components/cli/dockerfiles/Dockerfile.cross index 520a0d14b7..9ee67e4eef 100644 --- a/components/cli/dockerfiles/Dockerfile.cross +++ b/components/cli/dockerfiles/Dockerfile.cross @@ -1,3 +1,3 @@ -FROM dockercore/golang-cross:1.10.6@sha256:2054e793010774e9dbafc808dd550a99f8468013731728bea7fce56681510078 +FROM dockercore/golang-cross:1.10.8@sha256:a93210f55a8137b4aa4b9f033ac7a80b66ab6337e98e7afb62abe93b4ad73cad ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 WORKDIR /go/src/github.com/docker/cli diff --git a/components/cli/dockerfiles/Dockerfile.dev b/components/cli/dockerfiles/Dockerfile.dev index 710aa9947d..c155587a7b 100644 --- a/components/cli/dockerfiles/Dockerfile.dev +++ b/components/cli/dockerfiles/Dockerfile.dev @@ -1,5 +1,5 @@ -FROM golang:1.10.6-alpine +FROM golang:1.10.8-alpine RUN apk add -U git make bash coreutils ca-certificates curl diff --git a/components/cli/dockerfiles/Dockerfile.e2e b/components/cli/dockerfiles/Dockerfile.e2e index 97be553546..b8428abb41 100644 --- a/components/cli/dockerfiles/Dockerfile.e2e +++ b/components/cli/dockerfiles/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.10.6 +ARG GO_VERSION=1.10.8 FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process diff --git a/components/cli/dockerfiles/Dockerfile.lint b/components/cli/dockerfiles/Dockerfile.lint index ecc9179292..8be2d6114c 100644 --- a/components/cli/dockerfiles/Dockerfile.lint +++ b/components/cli/dockerfiles/Dockerfile.lint @@ -1,4 +1,4 @@ -FROM golang:1.10.6-alpine +FROM golang:1.10.8-alpine RUN apk add -U git