From dc4f7fb3759eb65b3d3b51681eadfaf1143749aa Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 16 Jul 2020 15:45:25 +0200 Subject: [PATCH] Bump Golang 1.13.13 full diff: https://github.com/golang/go/compare/go1.13.12...go1.13.13 go1.13.13 (released 2020/07/14) includes security fixes to the crypto/x509 and net/http packages. See the Go 1.13.13 milestone on the issue tracker for details. https://github.com/golang/go/issues?q=milestone%3AGo1.13.13+label%3ACherryPickApproved 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 a09d76b26f..bc18f3a82f 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.12 + GOVERSION: 1.13.13 DEPVERSION: v0.4.1 install: diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native index f0adc78f89..a119612e6d 100644 --- a/dockerfiles/Dockerfile.binary-native +++ b/dockerfiles/Dockerfile.binary-native @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.12 +ARG GO_VERSION=1.13.13 FROM golang:${GO_VERSION}-alpine diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross index aacbbca9f5..74e9b1e809 100644 --- a/dockerfiles/Dockerfile.cross +++ b/dockerfiles/Dockerfile.cross @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.12 +ARG GO_VERSION=1.13.13 FROM dockercore/golang-cross:${GO_VERSION} ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 58459ee996..aceef03ee3 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.12 +ARG GO_VERSION=1.13.13 FROM golang:${GO_VERSION}-alpine diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index 1dc97f8c7d..2d9d05fea6 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.12 +ARG GO_VERSION=1.13.13 # 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 7284f9140d..5516dc4f7d 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.12 +ARG GO_VERSION=1.13.13 ARG GOLANGCI_LINTER_SHA="v1.21.0" FROM golang:${GO_VERSION}-alpine AS build