From 19d946e143a9028d7b9940126af77e781f95ee9d Mon Sep 17 00:00:00 2001 From: Jiawei Huang Date: Sat, 1 Feb 2025 22:59:59 -0800 Subject: [PATCH] Add protobuf-devel to calico/go-build and update protoc-gen-go Install protobuf-devel package include protobuf well-known types like timestamp.proto. We need them to build felixbackend proto. --- images/calico-go-build/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/calico-go-build/Dockerfile b/images/calico-go-build/Dockerfile index f28c1b80..e745f99d 100644 --- a/images/calico-go-build/Dockerfile +++ b/images/calico-go-build/Dockerfile @@ -59,7 +59,8 @@ RUN set -eux; \ iproute-devel \ iproute-tc \ libbpf-devel \ - llvm-${llvm_version} + llvm-${llvm_version} \ + protobuf-devel RUN set -eux; \ if [ "${TARGETARCH}" = "amd64" ]; then \ @@ -178,7 +179,7 @@ RUN set -eux; \ go install golang.org/x/tools/cmd/goimports@v0.28.0 && \ go install golang.org/x/tools/cmd/stringer@v0.28.0 && \ go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.5.1 && \ - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.1 && \ + go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.4 && \ go install gotest.tools/gotestsum@v1.12.0 && \ go install k8s.io/code-generator/cmd/client-gen@v${k8s_libs_version} && \ go install k8s.io/code-generator/cmd/conversion-gen@v${k8s_libs_version} && \