From 0cca3a12e6a0b8b3e67541145d77abb6ff363562 Mon Sep 17 00:00:00 2001 From: Joshua Casey Date: Mon, 9 Oct 2023 09:27:57 -0500 Subject: [PATCH 1/2] Update hack/update-go-mod/go.mod --- hack/update-go-mod/go.mod | 2 +- hack/update-go-mod/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/update-go-mod/go.mod b/hack/update-go-mod/go.mod index e3b4e552..64c5f786 100644 --- a/hack/update-go-mod/go.mod +++ b/hack/update-go-mod/go.mod @@ -2,4 +2,4 @@ module go.pinniped.dev/update-go-mod go 1.20 -require golang.org/x/mod v0.12.0 +require golang.org/x/mod v0.13.0 diff --git a/hack/update-go-mod/go.sum b/hack/update-go-mod/go.sum index 7f791da9..00726828 100644 --- a/hack/update-go-mod/go.sum +++ b/hack/update-go-mod/go.sum @@ -1,2 +1,2 @@ -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= +golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= From 1409f236da63ada7bcec923f1e489a4dacefcd4b Mon Sep 17 00:00:00 2001 From: Joshua Casey Date: Mon, 9 Oct 2023 09:28:27 -0500 Subject: [PATCH 2/2] Bump dockerfiles to golang:1.21.2 --- Dockerfile | 2 +- hack/Dockerfile_fips | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b3544f4d..8607f572 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # Prepare to cross-compile by always running the build stage in the build platform, not the target platform. -FROM --platform=$BUILDPLATFORM golang:1.21.1 as build-env +FROM --platform=$BUILDPLATFORM golang:1.21.2 as build-env WORKDIR /work diff --git a/hack/Dockerfile_fips b/hack/Dockerfile_fips index 6afe7b7a..4184db0c 100644 --- a/hack/Dockerfile_fips +++ b/hack/Dockerfile_fips @@ -18,7 +18,7 @@ # This is not currently using --platform to prepare to cross-compile because we use gcc below to build # platform-specific GCO code. This makes multi-arch builds slow due to target platform emulation. -FROM golang:1.21.1 as build-env +FROM golang:1.21.2 as build-env WORKDIR /work