Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/features/csm_observability/client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 <TAG> -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

Expand Down
2 changes: 1 addition & 1 deletion examples/features/csm_observability/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# following command from grpc-go directory:
# docker build -t <TAG> -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
Expand Down
4 changes: 2 additions & 2 deletions interop/observability/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Stage 1: Build the interop test client and server
#

FROM golang:1.23-bullseye as build
FROM golang:1.25-bullseye as build

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like golang:1.25-bullseye is not published yet.

$ docker pull golang:1.25-bullseye
Error response from daemon: manifest for golang:1.25-bullseye not found: manifest unknown: manifest unknown

$ docker pull golang:1.24-bullseye
1.24-bullseye: Pulling from library/golang
078965fc7cf3: Pull complete 
8620e616831b: Pull complete 
99bdf4e3059e: Pull complete 
79e3925f0bdb: Pull complete 
9a940d118df6: Pull complete 
25ac2e409764: Pull complete 
4f4fb700ef54: Pull complete 
Digest: sha256:2cdc80dc25edcb96ada1654f73092f2928045d037581fa4aa7c40d18af7dd85a
Status: Downloaded newer image for golang:1.24-bullseye
docker.io/library/golang:1.24-bullseye

We can use golang:1.25-alpine here also. I tried building with the alpine image and it worked.

TAG_NAME="gcr.io/a/b"
docker build --no-cache -t ${TAG_NAME} -f ./interop/observability/Dockerfile .

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed thanks.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just realized that this Dockerfile is using bullseye because the entrypoint is a bash script. Since alpine images don't have Bash, we'll need to use golang:1.24-bullseye instead. My apologies for the incorrect suggestion

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem. I had the tinkering something was off - you got it right.


WORKDIR /grpc-go
COPY . .
Expand All @@ -36,7 +36,7 @@ RUN go build -o server/ server/server.go && \
# with the given parameters.
#

FROM golang:1.23-bullseye
FROM golang:1.25-bullseye

ENV GRPC_GO_LOG_SEVERITY_LEVEL info
ENV GRPC_GO_LOG_VERBOSITY_LEVEL 2
Expand Down
2 changes: 1 addition & 1 deletion interop/xds/client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# following command from grpc-go directory:
# docker build -t <TAG> -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
Expand Down
2 changes: 1 addition & 1 deletion interop/xds/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# following command from grpc-go directory:
# docker build -t <TAG> -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
Expand Down
2 changes: 1 addition & 1 deletion test/kokoro/xds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down