From e065aa2798c1a0c99b425a01e6a8a64b29b032db Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 23 Jul 2019 15:31:36 -0700 Subject: [PATCH] Bump Go to 1.11.12 go1.11.12 (released 2019/07/08) includes fixes to the compiler and the linker. See the Go 1.11.12 milestone on our issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.11.12 Full diff: https://github.com/golang/go/compare/go1.11.11...go1.11.12 Signed-off-by: Kir Kolyshkin --- appveyor.yml | 4 ++-- dockerfiles/Dockerfile.binary-native | 2 +- dockerfiles/Dockerfile.cross | 2 +- dockerfiles/Dockerfile.dev | 2 +- dockerfiles/Dockerfile.e2e | 2 +- dockerfiles/Dockerfile.lint | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 99157df193..ca41dc23bf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli environment: GOPATH: c:\gopath - GOVERSION: 1.11.11 + GOVERSION: 1.11.12 DEPVERSION: v0.4.1 install: @@ -20,4 +20,4 @@ build_script: - ps: .\scripts\make.ps1 -Binary test_script: - - ps: .\scripts\make.ps1 -TestUnit \ No newline at end of file + - ps: .\scripts\make.ps1 -TestUnit diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native index b1f3ae82c2..8fa5e60959 100644 --- a/dockerfiles/Dockerfile.binary-native +++ b/dockerfiles/Dockerfile.binary-native @@ -1,4 +1,4 @@ -FROM golang:1.11.11-alpine +FROM golang:1.11.12-alpine RUN apk add -U git bash coreutils gcc musl-dev diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross index bcca51857a..9b9ba1368d 100644 --- a/dockerfiles/Dockerfile.cross +++ b/dockerfiles/Dockerfile.cross @@ -1,4 +1,4 @@ -FROM dockercore/golang-cross:1.11.11 +FROM dockercore/golang-cross:1.11.12 ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 WORKDIR /go/src/github.com/docker/cli COPY . . diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index d7731fb2cb..4432ad3928 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.11.11-alpine +FROM golang:1.11.12-alpine RUN apk add -U git make bash coreutils ca-certificates curl diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index e721b971a9..dd4eec0442 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.11.11 +ARG GO_VERSION=1.11.12 FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index 7f0ecb8dd9..8a3efd3f35 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,4 +1,4 @@ -FROM golang:1.11.11-alpine +FROM golang:1.11.12-alpine RUN apk add -U git