From 6e07d210a4b166c3eb8a19f0ac70ed1022881e31 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 26 Feb 2020 11:16:35 +0100 Subject: [PATCH] Update Golang 1.13.8 Also pinning the e2e image to the "buster" variant, which is what's currently used, but making it explicit. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 4313c8b3c6f3702acd81aa780d87b2b6c72e9b95) 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 | 4 ++-- dockerfiles/Dockerfile.lint | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d42d7b6614..7d13112f75 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.12.17 + GOVERSION: 1.13.8 DEPVERSION: v0.4.1 install: diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native index ea0aa3af51..e12456e0be 100644 --- a/dockerfiles/Dockerfile.binary-native +++ b/dockerfiles/Dockerfile.binary-native @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.12.17 +ARG GO_VERSION=1.13.8 FROM golang:${GO_VERSION}-alpine diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross index ba5cd44636..6bcf0d8999 100644 --- a/dockerfiles/Dockerfile.cross +++ b/dockerfiles/Dockerfile.cross @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.12.17 +ARG GO_VERSION=1.13.8 FROM dockercore/golang-cross:${GO_VERSION} ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index b83b4fde16..d75f60107c 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.12.17 +ARG GO_VERSION=1.13.8 FROM golang:${GO_VERSION}-alpine diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index 8cbe2e176d..2cd493b693 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -1,7 +1,7 @@ -ARG GO_VERSION=1.12.17 +ARG GO_VERSION=1.13.8 # Use Debian based image as docker-compose requires glibc. -FROM golang:${GO_VERSION} +FROM golang:${GO_VERSION}-buster RUN apt-get update && apt-get install -y \ build-essential \ diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index 8d3ef7a1e7..ac2acdfa0b 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.1.3-experimental -ARG GO_VERSION=1.12.17 +ARG GO_VERSION=1.13.8 ARG GOLANGCI_LINTER_SHA="v1.21.0" FROM golang:${GO_VERSION}-alpine AS build