Skip to content

Commit ca90f35

Browse files
Bump dependencies in Go services (#2716)
* frontend: Bump Go and gRPC * productcatalogservice: Bump Go and gRPC * shippingservice: Bump Go and gRPC * checkoutservice: Bump Go and gRPC * Replace "as" with "AS" in Dockerfiles * Bump Go in GitHub Actions * Update protos/demo.proto --------- Co-authored-by: Olivier Bourgeois <[email protected]>
1 parent 43947d7 commit ca90f35

File tree

37 files changed

+12972
-8094
lines changed

37 files changed

+12972
-8094
lines changed

.github/workflows/ci-main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
dotnet-version: '8.0'
4040
- uses: actions/setup-go@v5
4141
with:
42-
go-version: '1.22'
42+
go-version: '1.23'
4343
- name: Go Unit Tests
4444
timeout-minutes: 10
4545
run: |

.github/workflows/ci-pr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
dotnet-version: '8.0'
4444
- uses: actions/setup-go@v5
4545
with:
46-
go-version: '1.22'
46+
go-version: '1.23'
4747
- name: Go Unit Tests
4848
timeout-minutes: 10
4949
run: |

protos/demo.proto

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ syntax = "proto3";
1616

1717
package hipstershop;
1818

19+
option go_package = "github.com/GoogleCloudPlatform/microservices-demo/hipstershop";
20+
1921
// -----------------Cart service-----------------
2022

2123
service CartService {

src/adservice/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM eclipse-temurin:21@sha256:d2233012784e0b35d893f7802e28d39e39e9422180b4c6f14ed2fb714b0952e5 as builder
15+
FROM eclipse-temurin:21@sha256:d2233012784e0b35d893f7802e28d39e39e9422180b4c6f14ed2fb714b0952e5 AS builder
1616

1717
WORKDIR /app
1818

src/cartservice/src/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# https://mcr.microsoft.com/product/dotnet/sdk
16-
FROM mcr.microsoft.com/dotnet/sdk:8.0.401-noble@sha256:d37cbb248b78027e3f149ea422bc9dc3bbf5b8c47bd1150e14c9849462235e91 as builder
16+
FROM mcr.microsoft.com/dotnet/sdk:8.0.401-noble@sha256:d37cbb248b78027e3f149ea422bc9dc3bbf5b8c47bd1150e14c9849462235e91 AS builder
1717
WORKDIR /app
1818
COPY cartservice.csproj .
1919
RUN dotnet restore cartservice.csproj \

src/checkoutservice/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23.0-alpine@sha256:d0b31558e6b3e4cc59f6011d79905835108c919143ebecc58f35965bf79948f4 as builder
15+
FROM golang:1.23.0-alpine@sha256:d0b31558e6b3e4cc59f6011d79905835108c919143ebecc58f35965bf79948f4 AS builder
1616
WORKDIR /src
1717

1818
# restore dependencies

src/checkoutservice/genproto.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616

1717
# [START gke_checkoutservice_genproto]
1818

19-
PATH=$PATH:$GOPATH/bin
19+
PATH=$PATH:$(go env GOPATH)/bin
2020
protodir=../../protos
21+
outdir=./genproto
2122

22-
protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto
23+
protoc --proto_path=$protodir --go_out=./$outdir --go_opt=paths=source_relative --go-grpc_out=./$outdir --go-grpc_opt=paths=source_relative $protodir/demo.proto
2324

2425
# [END gke_checkoutservice_genproto]

0 commit comments

Comments
 (0)