From 936e9717ea2516d9ef3ff7e4466e54cc92955b4c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 18 May 2020 15:58:42 +0200 Subject: [PATCH] Bump Golang 1.13.11 full diff: https://github.com/golang/go/compare/go1.13.10...go1.13.11 go1.13.11 (released 2020/05/14) includes fixes to the compiler. See the Go 1.13.11 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.13.11+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 1ecca982edecdbf61bf1ea93b15f41eca9a9f312) Signed-off-by: Sebastiaan van Stijn --- appveyor.yml | 2 +- dockerfiles/Dockerfile.binary-native | 2 +- dockerfiles/Dockerfile.cross | 2 +- dockerfiles/Dockerfile.dev | 2 +- dockerfiles/Dockerfile.e2e | 2 +- dockerfiles/Dockerfile.lint | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6398b8be2dfb..20d481ad48ae 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.13.10 + GOVERSION: 1.13.11 DEPVERSION: v0.4.1 install: diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native index a452a982ac3e..1876bd29fb1b 100644 --- a/dockerfiles/Dockerfile.binary-native +++ b/dockerfiles/Dockerfile.binary-native @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.10 +ARG GO_VERSION=1.13.11 FROM golang:${GO_VERSION}-alpine diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross index 19c15a9a40c0..c9b24386e5f7 100644 --- a/dockerfiles/Dockerfile.cross +++ b/dockerfiles/Dockerfile.cross @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.10 +ARG GO_VERSION=1.13.11 FROM dockercore/golang-cross:${GO_VERSION} ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 1a44fd0e85c2..de074045bebd 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.10 +ARG GO_VERSION=1.13.11 FROM golang:${GO_VERSION}-alpine diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index 3956f7a9c0e8..26504f1ab1a7 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.10 +ARG GO_VERSION=1.13.11 # Use Debian based image as docker-compose requires glibc. FROM golang:${GO_VERSION}-buster diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index 162d7a3f90c3..d0a8b46414f0 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.1.3-experimental -ARG GO_VERSION=1.13.10 +ARG GO_VERSION=1.13.11 ARG GOLANGCI_LINTER_SHA="v1.21.0" FROM golang:${GO_VERSION}-alpine AS build