From 38dd744a113f705fba857ff1f3d43a58da1b30f0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 12 Dec 2021 01:16:34 +0100 Subject: [PATCH] [20.10] Update Go to 1.16.12 go1.16.12 (released 2021-12-09) includes security fixes to the syscall and net/http packages. See the Go 1.16.12 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.16.12+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- appveyor.yml | 2 +- dockerfiles/Dockerfile.dev | 2 +- dockerfiles/Dockerfile.lint | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d93ded7c3..c94d8d9407 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.3 ARG BASE_VARIANT=alpine -ARG GO_VERSION=1.16.11 +ARG GO_VERSION=1.16.12 ARG XX_VERSION=1.0.0-rc.2 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS gostable diff --git a/appveyor.yml b/appveyor.yml index 2313e0d074..3634dbd1d9 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.16.11 + GOVERSION: 1.16.12 DEPVERSION: v0.4.1 install: diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 48df12eb73..536d6a2fcb 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.3 -ARG GO_VERSION=1.16.11 +ARG GO_VERSION=1.16.12 FROM golang:${GO_VERSION}-alpine AS golang ENV CGO_ENABLED=0 diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index 359c8c1e36..2b54d8162e 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.3 -ARG GO_VERSION=1.16.11 +ARG GO_VERSION=1.16.12 ARG GOLANGCI_LINTER_SHA="v1.21.0" FROM golang:${GO_VERSION}-alpine AS build