Updated BESS protobuf files.

.github/workflows/pull_request.yml

@@ -11,11 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Checkout and build
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
       - name: Build the Docker image
         run: |
           make docker-build
 
+      - name: Generate bess_pb
+        run: |
+          make pb
+
       # Format the code
       - name: Clang Format
         run: |

Dockerfile

@@ -115,6 +115,17 @@ RUN apt-get update && \
 
 COPY --from=cpiface-build /bin/zmq-cpiface /bin
 
+# Stage build bess golang pb
+FROM golang AS protoc-gen
+RUN go get github.com/golang/protobuf/protoc-gen-go
+
+FROM bess-build AS go-pb
+COPY --from=protoc-gen /go/bin/protoc-gen-go /bin
+RUN mkdir /bess_pb && \
+    protoc -I /usr/include -I /protobuf/ \
+        /protobuf/*.proto /protobuf/ports/*.proto \
+        --go_out=plugins=grpc:/bess_pb
+
 FROM golang AS pfcpiface-build
 WORKDIR /pfcpiface
 COPY pfcpiface .
@@ -131,3 +142,4 @@ COPY --from=bess /bin/bessd /
 COPY --from=cpiface /bin/zmq-cpiface /
 COPY --from=pfcpiface /bin/pfcpiface /
 COPY --from=bess-build /protobuf /protobuf
+COPY --from=go-pb /bess_pb /bess_pb

Makefile

@@ -57,15 +57,9 @@ output:
 			.;
 
 # Golang grpc/protobuf generation
-PROTOS += output/protobuf/*.proto
-PROTOS += output/protobuf/ports/*.proto
-
-PROTO_INC += -I /usr/include
-PROTO_INC += -I output/protobuf/
-
-BESS_PB_DIR ?= pfcpiface/bess_pb
+BESS_PB_DIR ?= pfcpiface
 
 pb: output
-	protoc ${PROTO_INC} ${PROTOS} --go_out=plugins=grpc:${BESS_PB_DIR}
+	cp -a output/bess_pb ${BESS_PB_DIR}
 
 .PHONY: docker-build docker-push output pb