From fa47dff9234b97b6f0381ffc6d84998b26cd4553 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 11 Jan 2023 00:44:06 +0100
Subject: [PATCH] [20.10] update to go1.18.10

go1.18.10 (released 2023-01-10) includes fixes to cgo, the compiler, the linker,
and the crypto/x509, net/http, and syscall packages. See the Go 1.18.10 milestone
on the issue tracker for details:

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

full diff: https://github.com/golang/go/compare/go1.18.9...go1.18.10

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Dockerfile                           | 2 +-
 appveyor.yml                         | 2 +-
 docker-bake.hcl                      | 2 +-
 dockerfiles/Dockerfile.binary-native | 2 +-
 dockerfiles/Dockerfile.dev           | 2 +-
 dockerfiles/Dockerfile.e2e           | 2 +-
 dockerfiles/Dockerfile.lint          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2bce8d0da4..22d68c1cf6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG BASE_VARIANT=alpine
-ARG GO_VERSION=1.18.9
+ARG GO_VERSION=1.18.10
 ARG ALPINE_VERSION=3.16
 ARG XX_VERSION=1.1.0
 
diff --git a/appveyor.yml b/appveyor.yml
index f653a1205d..b0c031a29f 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.18.9
+  GOVERSION: 1.18.10
   DEPVERSION: v0.4.1
 
 install:
diff --git a/docker-bake.hcl b/docker-bake.hcl
index ab650ae68e..6d24ff5bf5 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,5 +1,5 @@
 variable "GO_VERSION" {
-    default = "1.18.9"
+    default = "1.18.10"
 }
 variable "VERSION" {
     default = ""
diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native
index c3aba60c35..b0239a2641 100644
--- a/dockerfiles/Dockerfile.binary-native
+++ b/dockerfiles/Dockerfile.binary-native
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18.9
+ARG GO_VERSION=1.18.10
 
 FROM    golang:${GO_VERSION}-alpine
 
diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
index de0c9a3a44..1b51313c4a 100644
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.18.9
+ARG GO_VERSION=1.18.10
 ARG ALPINE_VERSION=3.16
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang
diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e
index 73443dc18a..2597f58cf3 100644
--- a/dockerfiles/Dockerfile.e2e
+++ b/dockerfiles/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18.9
+ARG GO_VERSION=1.18.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 ea350554cc..13bd9acf05 100644
--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.18.9
+ARG GO_VERSION=1.18.10
 ARG ALPINE_VERSION=3.16
 ARG GOLANGCI_LINT_VERSION=v1.45.2