From de6a5fa447624824007e5fd613d8f24fe14f8d0d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 9 Apr 2020 22:25:39 +0200 Subject: [PATCH] Bump Golang 1.13.10 go1.13.10 (released 2020/04/08) includes fixes to the go command, the runtime, os/exec, and time packages. See the Go 1.13.10 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.13.10+label%3ACherryPickApproved full diff: https://github.com/golang/go/compare/go1.13.9...go1.13.10 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 687539013136fc464c3c9bee6db7cec851773ff4) 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 3d133bfefaa5..6398b8be2dfb 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.9 + GOVERSION: 1.13.10 DEPVERSION: v0.4.1 install: diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native index 5cd961fb98c1..a452a982ac3e 100644 --- a/dockerfiles/Dockerfile.binary-native +++ b/dockerfiles/Dockerfile.binary-native @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.9 +ARG GO_VERSION=1.13.10 FROM golang:${GO_VERSION}-alpine diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross index fec369c238fa..19c15a9a40c0 100644 --- a/dockerfiles/Dockerfile.cross +++ b/dockerfiles/Dockerfile.cross @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.9 +ARG GO_VERSION=1.13.10 FROM dockercore/golang-cross:${GO_VERSION} ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 889b6444e006..8462890ee49c 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.9 +ARG GO_VERSION=1.13.10 FROM golang:${GO_VERSION}-alpine diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index c10050da70be..3956f7a9c0e8 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.9 +ARG GO_VERSION=1.13.10 # 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 62ef066d652f..162d7a3f90c3 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.9 +ARG GO_VERSION=1.13.10 ARG GOLANGCI_LINTER_SHA="v1.21.0" FROM golang:${GO_VERSION}-alpine AS build