build protobuf in dockerfile for all services (open-telemetry#1386)

* generate protobuf in docker build for accountingservice, checkoutservice, currencyservice, and productcatalogservice * fix build context --------- Co-authored-by: Austin Parker <[email protected]> Co-authored-by: Pierre Tessier <[email protected]>
julianocosta89 · Mar 7, 2024 · 0c80094 · 0c80094
1 parent e82863b
commit 0c80094
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 14,202 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -49,7 +49,7 @@ jobs:
             setup-qemu: true
           - file: ./src/currencyservice/Dockerfile
             tag_suffix: currencyservice
-            context: ./src/currencyservice
+            context: ./
             setup-qemu: true
           - file: ./src/emailservice/Dockerfile
             tag_suffix: emailservice

diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,7 @@ test/tracetesting/tracetesting-vars.yaml
 /src/paymentservice/demo.proto
 /src/recommendationservice/demo_pb2*.py
 /src/shippingservice/proto/
+/src/productcatalogservice/genproto
+/src/currencyservice/proto
+/src/checkoutservice/genproto
+/src/accountingservice/genproto
diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -126,7 +126,8 @@ services:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-currencyservice
     container_name: currency-service
     build:
-      context: ./src/currencyservice
+      context: ./
+      dockerfile: ./src/currencyservice/Dockerfile
       cache_from:
         - ${IMAGE_NAME}:${IMAGE_VERSION}-currencyservice
     deploy:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -157,7 +157,8 @@ services:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-currencyservice
     container_name: currency-service
     build:
-      context: ./src/currencyservice
+      context: ./
+      dockerfile: ./src/currencyservice/Dockerfile
       cache_from:
         - ${IMAGE_NAME}:${IMAGE_VERSION}-currencyservice
     deploy:

diff --git a/src/accountingservice/Dockerfile b/src/accountingservice/Dockerfile
@@ -3,9 +3,16 @@
 
 
 FROM golang:1.22.0-alpine AS builder
+RUN apk update && apk add --no-cache make protobuf-dev
+RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
+
 WORKDIR /usr/src/app/
 
 COPY ./src/accountingservice/ ./
+COPY ./pb/ ./pb
+
+RUN protoc -I ./pb ./pb/demo.proto --go_out=./ --go-grpc_out=./
 RUN go build -o /go/bin/accountingservice/
 
 # -----------------------------------------------------------------------------