From 64bcd8a9e099f8a2f55507e5a0c06e4897b02cfc Mon Sep 17 00:00:00 2001
From: Joseph Schorr <josephschorr@users.noreply.github.com>
Date: Tue, 18 Jun 2024 19:44:56 -0400
Subject: [PATCH] Move to go 1.22.4 for a reported go vuln

---
 Dockerfile              | 4 ++--
 Dockerfile.release      | 2 +-
 e2e/go.mod              | 2 +-
 go.mod                  | 2 +-
 magefiles/go.mod        | 2 +-
 tools/analyzers/go.mod  | 2 +-
 tools/analyzers/go.work | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6ffcfa029f..2719ed1fec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM golang:1.22.3-alpine3.18 AS spicedb-builder
+FROM golang:1.22.4-alpine3.19 AS spicedb-builder
 WORKDIR /go/src/app
 RUN apk update && apk add --no-cache git
 COPY . .
 RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg/mod CGO_ENABLED=0 go build -v ./cmd/...
 
-FROM golang:1.22.2-alpine3.18 AS health-probe-builder
+FROM golang:1.22.4-alpine3.19 AS health-probe-builder
 WORKDIR /go/src/app
 RUN apk update && apk add --no-cache git
 RUN git clone https://github.com/grpc-ecosystem/grpc-health-probe.git
diff --git a/Dockerfile.release b/Dockerfile.release
index bc0e465caf..3dd2e540d0 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -1,7 +1,7 @@
 # vim: syntax=dockerfile
 ARG BASE=cgr.dev/chainguard/static:latest
 
-FROM golang:1.22.3-alpine3.18 AS health-probe-builder
+FROM golang:1.22.4-alpine3.19 AS health-probe-builder
 WORKDIR /go/src/app
 RUN apk update && apk add --no-cache git
 RUN git clone https://github.com/grpc-ecosystem/grpc-health-probe.git
diff --git a/e2e/go.mod b/e2e/go.mod
index f47ef02b7a..e4ad376ed5 100644
--- a/e2e/go.mod
+++ b/e2e/go.mod
@@ -1,6 +1,6 @@
 module github.com/authzed/spicedb/e2e
 
-go 1.22.2
+go 1.22.4
 
 require (
 	github.com/authzed/authzed-go v0.12.1-0.20240607163830-a28f71a1b0e5
diff --git a/go.mod b/go.mod
index 54614663ab..18d4e8a852 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/authzed/spicedb
 
-go 1.22.2
+go 1.22.4
 
 require (
 	buf.build/gen/go/prometheus/prometheus/protocolbuffers/go v1.34.1-20240528093609-8a58dfa894e0.1
diff --git a/magefiles/go.mod b/magefiles/go.mod
index 30769b9480..2f7d56fbd5 100644
--- a/magefiles/go.mod
+++ b/magefiles/go.mod
@@ -1,6 +1,6 @@
 module magefiles
 
-go 1.22.2
+go 1.22.4
 
 require (
 	github.com/agnivade/wasmbrowsertest v0.8.0
diff --git a/tools/analyzers/go.mod b/tools/analyzers/go.mod
index 6b83763a61..2cf6f62065 100644
--- a/tools/analyzers/go.mod
+++ b/tools/analyzers/go.mod
@@ -1,6 +1,6 @@
 module github.com/authzed/spicedb/tools/analyzers
 
-go 1.22.2
+go 1.22.4
 
 require golang.org/x/tools v0.11.0
 
diff --git a/tools/analyzers/go.work b/tools/analyzers/go.work
index 324ee2cbc5..3e41d518a7 100644
--- a/tools/analyzers/go.work
+++ b/tools/analyzers/go.work
@@ -1,4 +1,4 @@
-go 1.22.2
+go 1.22.4
 
 toolchain go1.21.8