Skip to content

Commit 4883b55

Browse files
committed
chore: 1.25.5 CVE fix
1 parent 62bfec0 commit 4883b55

File tree

8 files changed

+8
-11
lines changed

8 files changed

+8
-11
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# use `docker buildx imagetools inspect <image>` to get the multi-platform sha256
2-
FROM golang:1.25.4-alpine@sha256:d3f0cf7723f3429e3f9ed846243970b20a2de7bae6a5b66fc5914e228d831bbb AS spicedb-builder
2+
FROM golang:1.25.5-alpine@sha256:3587db7cc96576822c606d119729370dbf581931c5f43ac6d3fa03ab4ed85a10 AS spicedb-builder
33
WORKDIR /go/src/app
44
RUN apk update && apk add --no-cache git
55
COPY . .
66
# https://github.com/odigos-io/go-rtml#about-ldflags-checklinkname0
77
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg/mod CGO_ENABLED=0 go build -tags memoryprotection -v -ldflags=-checklinkname=0 -o spicedb ./cmd/spicedb
88

99
# use `docker buildx imagetools inspect <image>` to get the multi-platform sha256
10-
FROM golang:1.25.4-alpine@sha256:d3f0cf7723f3429e3f9ed846243970b20a2de7bae6a5b66fc5914e228d831bbb AS health-probe-builder
10+
FROM golang:1.25.5-alpine@sha256:3587db7cc96576822c606d119729370dbf581931c5f43ac6d3fa03ab4ed85a10 AS health-probe-builder
1111
WORKDIR /go/src/app
1212
RUN apk update && apk add --no-cache git
1313
RUN git clone https://github.com/authzed/grpc-health-probe.git

Dockerfile.release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# vim: syntax=dockerfile
22
# use `docker buildx imagetools inspect <image>` to get the multi-platform sha256
33
ARG BASE=cgr.dev/chainguard/static@sha256:b2e1c3d3627093e54f6805823e73edd17ab93d6c7202e672988080c863e0412b
4-
FROM golang:1.25.4-alpine@sha256:d3f0cf7723f3429e3f9ed846243970b20a2de7bae6a5b66fc5914e228d831bbb AS health-probe-builder
4+
FROM golang:1.25.5-alpine@sha256:3587db7cc96576822c606d119729370dbf581931c5f43ac6d3fa03ab4ed85a10 AS health-probe-builder
55
WORKDIR /go/src/app
66
RUN apk update && apk add --no-cache git
77
RUN git clone https://github.com/authzed/grpc-health-probe.git

e2e/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/authzed/spicedb/e2e
22

3-
go 1.25.3
3+
go 1.25.5
44

55
// See: https://github.com/envoyproxy/go-control-plane/issues/1074
66
replace github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.13.2
@@ -59,7 +59,6 @@ require (
5959
github.com/jzelinskie/stringz v0.0.3 // indirect
6060
github.com/mattn/go-colorable v0.1.14 // indirect
6161
github.com/mattn/go-isatty v0.0.20 // indirect
62-
github.com/odigos-io/go-rtml v0.0.1 // indirect
6362
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
6463
github.com/onsi/gomega v1.38.0 // indirect
6564
github.com/planetscale/vtprotobuf v0.6.1-0.20240917153116-6f2963f01587 // indirect

e2e/go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,8 +1789,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
17891789
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
17901790
github.com/ngrok/sqlmw v0.0.0-20220520173518-97c9c04efc79 h1:Dmx8g2747UTVPzSkmohk84S3g/uWqd6+f4SSLPhLcfA=
17911791
github.com/ngrok/sqlmw v0.0.0-20220520173518-97c9c04efc79/go.mod h1:E26fwEtRNigBfFfHDWsklmo0T7Ixbg0XXgck+Hq4O9k=
1792-
github.com/odigos-io/go-rtml v0.0.1 h1:5w21AOXZGq/6UhECv5B9RCrW7R8PzA8YgwdxqtajD0w=
1793-
github.com/odigos-io/go-rtml v0.0.1/go.mod h1:LqKwlorUKSNj1WQ0p/5e9+aOkirEiHQx+FOxdhku/cs=
17941792
github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus=
17951793
github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
17961794
github.com/onsi/gomega v1.38.0 h1:c/WX+w8SLAinvuKKQFh77WEucCnPk4j2OTUr7lt7BeY=

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/authzed/spicedb
22

3-
go 1.25.3
3+
go 1.25.5
44

55
// NOTE: We are using a *copy* of `cel-go` here to ensure there isn't a conflict
66
// with the version used in Kubernetes. This is a temporary measure until we can

magefiles/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module magefiles
22

3-
go 1.25.3
3+
go 1.25.5
44

55
require (
66
github.com/agnivade/wasmbrowsertest v0.11.0

tools/analyzers/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/authzed/spicedb/tools/analyzers
22

3-
go 1.25.3
3+
go 1.25.5
44

55
require (
66
github.com/samber/lo v1.52.0

tools/analyzers/go.work

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.25.3
1+
go 1.25.5
22

33
use (
44
.

0 commit comments

Comments
 (0)