Skip to content

chore: update gRPC to v1.46.7 for http/1.1 support #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
psx95 merged 1 commit into from
Feb 28, 2024
Merged

chore: update gRPC to v1.46.7 for http/1.1 support #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ RUN mkdir /tmp/glog && cd /tmp/glog && \
# -DCMAKE_CXX_STANDARD=11 is necessary since it is the minimum version supported
# by gRPC dependencies. Xenial sets default version to c++98.
#
# See https://github.com/grpc/grpc/blob/v1.36.4/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
RUN git clone --depth=1 --recursive -b v1.36.4 https://github.com/grpc/grpc.git /tmp/grpc && \
# See https://github.com/grpc/grpc/blob/v1.46.7/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
RUN git clone --depth=1 --recursive -b v1.46.7 https://github.com/grpc/grpc.git /tmp/grpc && \
cd /tmp/grpc/ && \
# Install protobuf
mkdir -p third_party/protobuf/cmake/build && \
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN apk --no-cache add \
zlib-dev

# Install JDK 11 as sampling heap profiler depends on the new JVMTI APIs.
RUN apk --no-cache add openjdk11-jdk
RUN apk --no-cache add openjdk11-jdk

# openssl
# This openssl (compiled with -fPIC) is used to statically link into the agent
Expand Down Expand Up @@ -88,8 +88,8 @@ RUN mkdir /tmp/glog && cd /tmp/glog && \
# Limit the number of threads used by make, as unlimited threads causes
# memory exhausted error on the Kokoro VM.
#
# See https://github.com/grpc/grpc/blob/v1.36.4/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
RUN git clone --depth=1 --recursive -b v1.36.4 https://github.com/grpc/grpc.git /tmp/grpc && \
# See https://github.com/grpc/grpc/blob/v1.46.7/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
RUN git clone --depth=1 --recursive -b v1.46.7 https://github.com/grpc/grpc.git /tmp/grpc && \
cd /tmp/grpc/ && \
# Install protobuf
mkdir -p third_party/protobuf/cmake/build && \
Expand Down Expand Up @@ -117,5 +117,5 @@ RUN git clone --depth=1 --recursive -b v1.36.4 https://github.com/grpc/grpc.git
make -j4 install && \
cd ~ && rm -rf /tmp/grpc

ENV PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/ssl/lib/pkgconfig:/usr/local/grpc/lib/pkgconfig:/usr/local/lib64/pkgconfig"
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"
ENV PATH="${PATH}:/usr/local/grpc/bin"