diff --git a/examples/features/csm_observability/client/Dockerfile b/examples/features/csm_observability/client/Dockerfile index 0e974c135372..6d46d079db87 100644 --- a/examples/features/csm_observability/client/Dockerfile +++ b/examples/features/csm_observability/client/Dockerfile @@ -15,7 +15,7 @@ # Dockerfile for building the example client. To build the image, run the # following command from grpc-go directory: # docker build -t -f examples/features/csm_observability/client/Dockerfile . -FROM golang:1.23-alpine as build +FROM golang:1.25-alpine as build RUN apk --no-cache add curl diff --git a/examples/features/csm_observability/server/Dockerfile b/examples/features/csm_observability/server/Dockerfile index 3ba99a7f34a6..7ab8e2e8b98c 100644 --- a/examples/features/csm_observability/server/Dockerfile +++ b/examples/features/csm_observability/server/Dockerfile @@ -16,7 +16,7 @@ # following command from grpc-go directory: # docker build -t -f examples/features/csm_observability/server/Dockerfile . -FROM golang:1.23-alpine as build +FROM golang:1.25-alpine as build RUN apk --no-cache add curl # Make a grpc-go directory and copy the repo into it. WORKDIR /go/src/grpc-go diff --git a/interop/observability/Dockerfile b/interop/observability/Dockerfile index e4e3a3c7b200..32cfb8109866 100644 --- a/interop/observability/Dockerfile +++ b/interop/observability/Dockerfile @@ -17,7 +17,7 @@ # Stage 1: Build the interop test client and server # -FROM golang:1.23-bullseye as build +FROM golang:1.24-bullseye as build WORKDIR /grpc-go COPY . . @@ -36,7 +36,7 @@ RUN go build -o server/ server/server.go && \ # with the given parameters. # -FROM golang:1.23-bullseye +FROM golang:1.24-bullseye ENV GRPC_GO_LOG_SEVERITY_LEVEL info ENV GRPC_GO_LOG_VERBOSITY_LEVEL 2 diff --git a/interop/xds/client/Dockerfile b/interop/xds/client/Dockerfile index 47c4bccdfeb4..f170ab3c2361 100644 --- a/interop/xds/client/Dockerfile +++ b/interop/xds/client/Dockerfile @@ -16,7 +16,7 @@ # following command from grpc-go directory: # docker build -t -f interop/xds/client/Dockerfile . -FROM golang:1.23-alpine as build +FROM golang:1.25-alpine as build # Make a grpc-go directory and copy the repo into it. WORKDIR /go/src/grpc-go diff --git a/interop/xds/server/Dockerfile b/interop/xds/server/Dockerfile index a43bbe496b77..08fc49764c89 100644 --- a/interop/xds/server/Dockerfile +++ b/interop/xds/server/Dockerfile @@ -16,7 +16,7 @@ # following command from grpc-go directory: # docker build -t -f interop/xds/server/Dockerfile . -FROM golang:1.23-alpine as build +FROM golang:1.25-alpine as build # Make a grpc-go directory and copy the repo into it. WORKDIR /go/src/grpc-go diff --git a/test/kokoro/xds.sh b/test/kokoro/xds.sh index daac0d68e068..886146c0f27a 100755 --- a/test/kokoro/xds.sh +++ b/test/kokoro/xds.sh @@ -9,7 +9,7 @@ export GOPATH="${HOME}/gopath" pushd grpc-go/interop/xds/client # Install a version of Go supported by gRPC for the new features, e.g. # errors.Is() -gofilename=go1.23.0.linux-amd64.tar.gz +gofilename=go1.25.0.linux-amd64.tar.gz curl --retry 3 -O -L "https://go.dev/dl/${gofilename}" sudo tar -C /usr/local -xf "${gofilename}" sudo ln -s /usr/local/go/bin/go /usr/bin/go