Skip to content

Commit 8ba12d6

Browse files
authored
Bump dependencies in Go services (#152)
* Bump core Go deps * Bump more deps * Regenerate pb.go files
1 parent e6eafcb commit 8ba12d6

30 files changed

+14757
-8102
lines changed

pb/demo.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ syntax = "proto3";
22

33
package hipstershop;
44

5+
option go_package = "github.com/signalfx/miscroservices-demo/hipstershop";
6+
57
// -----------------Cart service-----------------
68

79
service CartService {

src/checkoutservice/Dockerfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
FROM golang:1.20-alpine as builder
1+
FROM golang:1.22-alpine AS builder
22
RUN apk add --no-cache ca-certificates git
33

4-
ENV PROJECT github.com/signalfx/microservices-demo/src/checkoutservice
5-
WORKDIR /go/src/$PROJECT
6-
4+
WORKDIR /app
75
COPY . .
8-
ENV GO111MODULE on
96
RUN go build -o /go/bin/checkoutservice .
107

11-
FROM alpine as release
8+
FROM alpine AS release
129
RUN apk add --no-cache ca-certificates
1310
RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
1411
wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \

src/checkoutservice/genproto.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
#!/bin/bash -e
1818

19-
PATH=$PATH:$GOPATH/bin
19+
PATH=$PATH:$(go env GOPATH)/bin
2020
protodir=../../pb
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

0 commit comments

Comments
 (0)