diff --git a/net/grpc/gateway/docker/protoc_plugin/Dockerfile b/net/grpc/gateway/docker/protoc_plugin/Dockerfile index cd0bbd7c7..43736b99d 100644 --- a/net/grpc/gateway/docker/protoc_plugin/Dockerfile +++ b/net/grpc/gateway/docker/protoc_plugin/Dockerfile @@ -17,24 +17,24 @@ FROM grpcweb/prereqs ARG MAKEFLAGS=-j8 RUN apt-get -qq update && apt-get -qq install -y \ - autoconf \ - automake \ + cmake \ build-essential \ curl \ git \ libtool \ libssl-dev \ make \ - zip + zip + + +WORKDIR /github/grpc-web/third_party/protobuf +RUN cmake . -DCMAKE_CXX_STANDARD=17 +RUN cmake --build . + + +RUN cd /github/grpc-web/javascript/net/grpc/web/generator && \ +make protoc-gen-grpc-web + -WORKDIR /github/grpc-web -RUN cd ./third_party/protobuf && \ - ./autogen.sh && \ - ./configure && \ - make && \ - make install && \ - ldconfig -RUN cd ./javascript/net/grpc/web/generator && \ - make protoc-gen-grpc-web diff --git a/scripts/init_submodules.sh b/scripts/init_submodules.sh index 52bead825..d8848125b 100755 --- a/scripts/init_submodules.sh +++ b/scripts/init_submodules.sh @@ -16,4 +16,4 @@ set -ex cd "$(dirname "$0")"/.. git submodule --quiet update --init --recursive -(cd third_party/protobuf && git checkout tags/v3.15.6) +(cd third_party/protobuf && git checkout tags/v27.1)