File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -104,8 +104,8 @@ RUN mkdir /tmp/glog && cd /tmp/glog && \
104104# -DCMAKE_CXX_STANDARD=11 is necessary since it is the minimum version supported
105105# by gRPC dependencies. Xenial sets default version to c++98.
106106#
107- # See https://github.com/grpc/grpc/blob/v1.36.4 /test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
108- RUN git clone --depth=1 --recursive -b v1.36.4 https://github.com/grpc/grpc.git /tmp/grpc && \
107+ # See https://github.com/grpc/grpc/blob/v1.46.7 /test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
108+ RUN git clone --depth=1 --recursive -b v1.46.7 https://github.com/grpc/grpc.git /tmp/grpc && \
109109 cd /tmp/grpc/ && \
110110 # Install protobuf
111111 mkdir -p third_party/protobuf/cmake/build && \
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ RUN apk --no-cache add \
3939 zlib-dev
4040
4141# Install JDK 11 as sampling heap profiler depends on the new JVMTI APIs.
42- RUN apk --no-cache add openjdk11-jdk
42+ RUN apk --no-cache add openjdk11-jdk
4343
4444# openssl
4545# This openssl (compiled with -fPIC) is used to statically link into the agent
@@ -88,8 +88,8 @@ RUN mkdir /tmp/glog && cd /tmp/glog && \
8888# Limit the number of threads used by make, as unlimited threads causes
8989# memory exhausted error on the Kokoro VM.
9090#
91- # See https://github.com/grpc/grpc/blob/v1.36.4 /test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
92- RUN git clone --depth=1 --recursive -b v1.36.4 https://github.com/grpc/grpc.git /tmp/grpc && \
91+ # See https://github.com/grpc/grpc/blob/v1.46.7 /test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
92+ RUN git clone --depth=1 --recursive -b v1.46.7 https://github.com/grpc/grpc.git /tmp/grpc && \
9393 cd /tmp/grpc/ && \
9494 # Install protobuf
9595 mkdir -p third_party/protobuf/cmake/build && \
@@ -117,5 +117,5 @@ RUN git clone --depth=1 --recursive -b v1.36.4 https://github.com/grpc/grpc.git
117117 make -j4 install && \
118118 cd ~ && rm -rf /tmp/grpc
119119
120- ENV PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/ssl/lib/pkgconfig:/usr/local/grpc/lib/pkgconfig:/usr/local/lib64/pkgconfig"
120+ ENV PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/ssl/lib/pkgconfig:/usr/local/grpc/lib/pkgconfig:/usr/local/grpc/lib64/pkgconfig:/usr/local/ lib64/pkgconfig"
121121ENV PATH="${PATH}:/usr/local/grpc/bin"
You can’t perform that action at this time.
0 commit comments