From a282e0c5d20c770870402079c335dac42b97bf01 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 4 Mar 2022 16:45:28 +0100
Subject: [PATCH] [20.10] update to go 1.16.15 to address CVE-2022-24921

Addresses [CVE-2022-24921](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24921)

go1.16.15 (released 2022-03-03) includes a security fix to the regexp/syntax package,
as well as bug fixes to the compiler, runtime, the go command, and to the net package.
See the Go 1.16.15 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.16.15+label%3ACherryPickApproved

full diff: https://github.com/golang/go/compare/go1.16.14...go1.16.15

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 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 4873c41997..955c280e9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.3
 
 ARG BASE_VARIANT=alpine
-ARG GO_VERSION=1.16.14
+ARG GO_VERSION=1.16.15
 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 1eb8598673..af219dc358 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.14
+  GOVERSION: 1.16.15
   DEPVERSION: v0.4.1
 
 install:
diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
index 3e93340225..cf8ab33c48 100644
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.3
 
-ARG GO_VERSION=1.16.14
+ARG GO_VERSION=1.16.15
 
 FROM golang:${GO_VERSION}-alpine AS golang
 ENV  CGO_ENABLED=0
diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint
index 95e572d475..e48fd23d78 100644
--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.3
 
-ARG GO_VERSION=1.16.14
+ARG GO_VERSION=1.16.15
 ARG GOLANGCI_LINTER_SHA="v1.21.0"
 
 FROM    golang:${GO_VERSION}-alpine AS build