From b1e4cde2da1ecfa869e33e699c338825fa8f54f8 Mon Sep 17 00:00:00 2001
From: Milas Bowman <milas.bowman@docker.com>
Date: Tue, 2 Aug 2022 13:39:42 -0400
Subject: [PATCH] build: bump to Go 1.18.5

Can give 1.19 a bit of time before we upgrade ;)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
---
 .github/workflows/ci.yml       | 2 +-
 .github/workflows/release.yaml | 4 ++--
 Dockerfile                     | 4 ++--
 docs/docs.Dockerfile           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4882cf4c9..0a1293079 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ on:
         required: false
         default: "false"
 env:
-  GO_VERSION: 1.18.4
+  GO_VERSION: 1.18.5
 jobs:
   lint:
     name: Lint
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8b4b46c88..002c105be 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -7,7 +7,7 @@ on:
         description: "Release Tag"
         required: true
 env:
-  GO_VERSION: 1.18.4
+  GO_VERSION: 1.18.5
 jobs:
   upload-release:
     runs-on: ubuntu-latest
@@ -23,7 +23,7 @@ jobs:
 
       - name: Setup docker CLI
         run: |
-          curl https://download.docker.com/linux/static/stable/x86_64/docker-20.10.3.tgz | tar xz
+          curl https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz | tar xz
           sudo cp ./docker/docker /usr/bin/ && rm -rf docker && docker version
 
       - name: Build
diff --git a/Dockerfile b/Dockerfile
index e24a0fc17..69d350124 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,8 +15,8 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-ARG GO_VERSION=1.18.4-alpine
-ARG GOLANGCI_LINT_VERSION=v1.46.2-alpine
+ARG GO_VERSION=1.18.5-alpine
+ARG GOLANGCI_LINT_VERSION=v1.47.3-alpine
 ARG PROTOC_GEN_GO_VERSION=v1.4.3
 
 FROM --platform=${BUILDPLATFORM} golangci/golangci-lint:${GOLANGCI_LINT_VERSION} AS local-golangci-lint
diff --git a/docs/docs.Dockerfile b/docs/docs.Dockerfile
index d2f88a929..504faefcb 100644
--- a/docs/docs.Dockerfile
+++ b/docs/docs.Dockerfile
@@ -15,7 +15,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-ARG GO_VERSION=1.18.4
+ARG GO_VERSION=1.18.5
 ARG FORMATS=md,yaml
 
 FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION}-alpine AS docsgen