Merge pull request #789 from henry118/fix

regenerate protobuf with the right protoc compiler version
firecracker-microvm · May 23, 2024 · 9bad4be · 9bad4be
2 parents 73f17ac + 12ccf1c
commit 9bad4be
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 59 deletions.
diff --git a/go.mod b/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/containernetworking/plugins v1.4.0
 	github.com/firecracker-microvm/firecracker-go-sdk v0.22.1-0.20220427214706-47505a9cf951
 	github.com/gofrs/uuid v3.3.0+incompatible
+	github.com/golang/protobuf v1.5.4
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/miekg/dns v1.1.25
 	github.com/opencontainers/image-spec v1.1.0-rc3
@@ -79,7 +80,6 @@ require (
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect

diff --git a/proto/events.pb.go b/proto/events.pb.go
diff --git a/proto/firecracker.pb.go b/proto/firecracker.pb.go
diff --git a/proto/service/drivemount/Makefile b/proto/service/drivemount/Makefile
@@ -17,7 +17,7 @@ PROTO_GEN_SRC_TTRPC := $(addprefix ttrpc/,$(PROTO_GEN_SRC))
 
 $(PROTO_GEN_SRC_TTRPC): $(PROTO_SRC)
 	protoc -I. -I$(PROTOPATH)\
-		--go-out=:ttrpc \
+		--go_out=:ttrpc \
 		$^
 	protoc -I. -I$(PROTOPATH)\
 		--go-ttrpc_out=:ttrpc \

diff --git a/proto/service/drivemount/ttrpc/drivemount.pb.go b/proto/service/drivemount/ttrpc/drivemount.pb.go
diff --git a/proto/service/drivemount/ttrpc/drivemount_ttrpc.pb.go b/proto/service/drivemount/ttrpc/drivemount_ttrpc.pb.go
diff --git a/proto/service/fccontrol/Makefile b/proto/service/fccontrol/Makefile
@@ -17,10 +17,10 @@ PROTO_GEN_SRC_TTRPC := $(addprefix ttrpc/,$(PROTO_GEN_SRC))
 
 $(PROTO_GEN_SRC_TTRPC): $(PROTO_SRC)
 	protoc -I. -I$(PROTOPATH)\
-		--go_out=Mfirecracker.proto=github.com/firecracker-microvm/firecracker-containerd/proto:ttrpc \
+		--go_out=Mfirecracker.proto=github.com/firecracker-microvm/firecracker-containerd/proto,Mtypes.proto=github.com/firecracker-microvm/firecracker-containerd/proto:ttrpc \
 		$^
 	protoc -I. -I$(PROTOPATH)\
-		--go-ttrpc_out=Mfirecracker.proto=github.com/firecracker-microvm/firecracker-containerd/proto:ttrpc \
+		--go-ttrpc_out=Mfirecracker.proto=github.com/firecracker-microvm/firecracker-containerd/proto,Mtypes.proto=github.com/firecracker-microvm/firecracker-containerd/proto:ttrpc \
 		$^
 
 proto: $(PROTO_GEN_SRC_TTRPC)

diff --git a/proto/service/fccontrol/ttrpc/fccontrol.pb.go b/proto/service/fccontrol/ttrpc/fccontrol.pb.go
diff --git a/proto/service/fccontrol/ttrpc/fccontrol_ttrpc.pb.go b/proto/service/fccontrol/ttrpc/fccontrol_ttrpc.pb.go
diff --git a/proto/service/ioproxy/ttrpc/ioproxy.pb.go b/proto/service/ioproxy/ttrpc/ioproxy.pb.go
diff --git a/proto/service/ioproxy/ttrpc/ioproxy_ttrpc.pb.go b/proto/service/ioproxy/ttrpc/ioproxy_ttrpc.pb.go
diff --git a/proto/types.pb.go b/proto/types.pb.go
diff --git a/tools/docker/Dockerfile.proto-builder b/tools/docker/Dockerfile.proto-builder
@@ -14,8 +14,8 @@
 FROM golang:1.21-bullseye
 
 RUN apt-get update && apt-get install --yes --no-install-recommends \
-	libprotobuf-dev \
-	protobuf-compiler \
+	libprotobuf-dev=3.12.4-1+deb11u1 \
+	protobuf-compiler=3.12.4-1+deb11u1 \
 	&& go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.33 \
 	&& go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@v1.2.3 \
 	&& mkdir /protobuf