From fbaa013d80a565aee9e3d936f99e7e5fc3f19db7 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 25 Dec 2019 21:15:43 +0800 Subject: [PATCH] upgrade grpc from v1.14.2 to v1.24.3 (protobuf from v3.5.1 to v3.8.0) --- docker/builder/Dockerfile | 4 +--- release-centos7/prepare-environments/install-grpc.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile index 3070aabf801..0f801e124c7 100644 --- a/docker/builder/Dockerfile +++ b/docker/builder/Dockerfile @@ -15,7 +15,7 @@ RUN apt update -y \ && pip3 install pybind11 pyinstaller dnspython uri requests urllib3 toml setuptools \ && rm -rf /var/lib/apt/lists/* -RUN git clone https://github.com/grpc/grpc.git && cd grpc && git checkout v1.14.2 && git submodule update --init \ +RUN git clone https://github.com/grpc/grpc.git && cd grpc && git checkout v1.24.3 && git submodule update --init \ && cd /grpc && mkdir .build && cd .build && cmake .. -DgRPC_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo) \ && rm -rf /grpc/.build \ && cd /grpc && mkdir .build && cd .build && cmake .. -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo) \ @@ -28,5 +28,3 @@ RUN git clone https://github.com/grpc/grpc.git && cd grpc && git checkout v1.14. && ./release.sh \ && rm -rf /flash_cluster_manager && cp -r dist/flash_cluster_manager/ /flash_cluster_manager \ && cd / && rm -rf tics-build/ - - diff --git a/release-centos7/prepare-environments/install-grpc.sh b/release-centos7/prepare-environments/install-grpc.sh index fd13656cfdc..f58c6c4424c 100755 --- a/release-centos7/prepare-environments/install-grpc.sh +++ b/release-centos7/prepare-environments/install-grpc.sh @@ -2,7 +2,7 @@ set -e -VERSION="v1.14.2" +VERSION="v1.24.3" THREADS=$(nproc || grep -c ^processor /proc/cpuinfo) cd ~