Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deps: Bump Go version in Dockerfiles and test/kokoro/xds.sh #7629

Merged
merged 3 commits into from
Sep 13, 2024
Merged

Deps: Bump Go version in Dockerfiles and test/kokoro/xds.sh #7629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e79099
Bump Go version in psm-interop Docker images
arjan-bal Sep 13, 2024
2d8d2b6
Update Go version in all dockerfiles and xds script to 1.23
arjan-bal Sep 13, 2024
4b60428
Trigger mergeable
arjan-bal Sep 13, 2024
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
View file
Open in desktop
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.21-alpine as build
FROM golang:1.23-alpine as build

RUN apk --no-cache add curl

Expand Down
2 changes: 1 addition & 1 deletion examples/features/csm_observability/server/Dockerfile
View file
Open in desktop
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.21-alpine as build
FROM golang:1.23-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
View file
Open in desktop
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.21-bullseye as build
FROM golang:1.23-bullseye as build

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.21-bullseye
FROM golang:1.23-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
View file
Open in desktop
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.21-alpine as build
Copy link
Member

Choose a reason for hiding this comment

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

Go 1.23 is out now -- should we go straight to that version instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated to go1.23. Also changed remaining Dockerfiles in the repo and test/kokoro/xds.sh to use go1.23.

Copy link
Member

Choose a reason for hiding this comment

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

👍 Then we won't need to update again in 6 months.

FROM golang:1.23-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
View file
Open in desktop
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.21-alpine as build
FROM golang:1.23-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
View file
Open in desktop
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.21.0.linux-amd64.tar.gz
gofilename=go1.23.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