From 36dd5b79ca81c7d945fb701d8eb958c0e212e24c Mon Sep 17 00:00:00 2001
From: Ben Manuel <ben.manuel@procore.com>
Date: Thu, 29 Jun 2023 15:34:00 -0500
Subject: [PATCH] Update to golang 1.19.10

This addresses CVE-2023-29402, CVE-2023-29403, CVE-2023-29404, CVE-2023-29405
which were patched in 1.19.10.

Signed-off-by: Ben Manuel <ben.manuel@procore.com>
---
 .github/workflows/build.yml   | 2 +-
 Dockerfile                    | 4 ++--
 dockerfiles/git.Dockerfile    | 4 ++--
 dockerfiles/lint.Dockerfile   | 4 ++--
 dockerfiles/vendor.Dockerfile | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4bc90dde1..63c7de297 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       matrix:
         go:
           - 1.18
-          - 1.19.9
+          - 1.19.10
     steps:
       -
         name: Checkout
diff --git a/Dockerfile b/Dockerfile
index c6ebb7892..a0ebb24b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.19.9
-ARG ALPINE_VERSION=3.16
+ARG GO_VERSION=1.19.10
+ARG ALPINE_VERSION=3.18
 ARG XX_VERSION=1.2.1
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
diff --git a/dockerfiles/git.Dockerfile b/dockerfiles/git.Dockerfile
index debe554ea..47cab54ec 100644
--- a/dockerfiles/git.Dockerfile
+++ b/dockerfiles/git.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.19.9
-ARG ALPINE_VERSION=3.16
+ARG GO_VERSION=1.19.10
+ARG ALPINE_VERSION=3.18
 
 FROM alpine:${ALPINE_VERSION} AS base
 RUN apk add --no-cache git gpg
diff --git a/dockerfiles/lint.Dockerfile b/dockerfiles/lint.Dockerfile
index a9743c166..c9340f559 100644
--- a/dockerfiles/lint.Dockerfile
+++ b/dockerfiles/lint.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.19.9
-ARG ALPINE_VERSION=3.16
+ARG GO_VERSION=1.19.10
+ARG ALPINE_VERSION=3.18
 ARG GOLANGCI_LINT_VERSION=v1.52
 
 FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint
diff --git a/dockerfiles/vendor.Dockerfile b/dockerfiles/vendor.Dockerfile
index 1ff56095a..3377e897d 100644
--- a/dockerfiles/vendor.Dockerfile
+++ b/dockerfiles/vendor.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.19.9
-ARG ALPINE_VERSION=3.16
+ARG GO_VERSION=1.19.10
+ARG ALPINE_VERSION=3.18
 ARG MODOUTDATED_VERSION=v0.8.0
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base