From 9a64023d14729623ce3279ccd1b6a1fd5865949d Mon Sep 17 00:00:00 2001 From: Peter Grant Date: Tue, 14 Nov 2023 10:15:55 +1100 Subject: [PATCH] update golang version Signed-off-by: Peter Grant --- go.mod | 2 +- scripts/build_funcs.sh | 2 +- test/integration/testImage/Dockerfile | 2 +- test/integration/testImage/src/go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index b2af76edf..27509f080 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/vmware-tanzu/sonobuoy -go 1.20 +go 1.21 require ( github.com/briandowns/spinner v1.19.0 diff --git a/scripts/build_funcs.sh b/scripts/build_funcs.sh index 7e11fa87e..78313841c 100755 --- a/scripts/build_funcs.sh +++ b/scripts/build_funcs.sh @@ -28,7 +28,7 @@ IMAGE_BRANCH=$(git rev-parse --abbrev-ref HEAD | sed 's/\///g') GIT_REF_LONG=$(git rev-parse --verify HEAD) BUILDMNT=/go/src/$GOTARGET -BUILD_IMAGE=golang:1.20 +BUILD_IMAGE=golang:1.21.4 AMD_IMAGE=gcr.io/distroless/static:nonroot ARM_IMAGE=gcr.io/distroless/static:nonroot-arm64 PPC64LE_IMAGE=gcr.io/distroless/static:nonroot-ppc64le diff --git a/test/integration/testImage/Dockerfile b/test/integration/testImage/Dockerfile index 8b267aca0..511fab6e9 100644 --- a/test/integration/testImage/Dockerfile +++ b/test/integration/testImage/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.20 AS base +FROM golang:1.21.4 AS base WORKDIR /src # Handle the go modules first to take advantage of Docker cache. diff --git a/test/integration/testImage/src/go.mod b/test/integration/testImage/src/go.mod index 478e9d5aa..544c7e254 100644 --- a/test/integration/testImage/src/go.mod +++ b/test/integration/testImage/src/go.mod @@ -1,6 +1,6 @@ module github.com/vmware-tanzu/sonobuoy/test/integration/testImage/src -go 1.20 +go 1.21 require ( github.com/pkg/errors v0.8.1