Skip to content

Commit ad43d71

Browse files
committed
Upgrade grpc and use associated commit #s for dependencies (PROTOBUF_VERSION & GTEST_VERSION)
Signed-off-by: Lacewell, Chaunte W <[email protected]>
1 parent d112f17 commit ad43d71

File tree

1 file changed

+36
-14
lines changed

1 file changed

+36
-14
lines changed

.github/scripts/Dockerfile.checkin

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ ENV ABSEIL_VERSION="20250512.1" \
7878
AWS_SDK_VERSION="1.11.336" \
7979
CMAKE_VERSION="v3.28.5" \
8080
FAISS_VERSION="v1.9.0" \
81-
GRPC_VERSION="v1.73.0" \
82-
GTEST_VERSION="v1.12.0" \
81+
GRPC_VERSION="v1.75.1" \
82+
GTEST_VERSION="52eb8108c5bdec04579160ae17225d66034bd723" \
83+
PROTOBUF_VERSION="74211c0dfc2777318ab53c2cd2c317a2ef9012de" \
8384
LIBEDIT_VERSION="20230828-3.1" \
8485
OPENCV_VERSION="4.9.0" \
8586
PEG_VERSION="0.1.19" \
@@ -94,8 +95,9 @@ RUN git clone --branch ${CMAKE_VERSION} https://github.com/Kitware/CMake.git /de
9495

9596
# PROTOBUF & ITS DEPENDENCIES (GOOGLETEST, ABSEIL-CPP)
9697
# hadolint ignore=DL3003,SC2086
97-
RUN git clone -b ${GTEST_VERSION} https://github.com/google/googletest.git /dependencies/googletest && \
98-
cd /dependencies/googletest && mkdir build && cd build && \
98+
RUN git clone https://github.com/google/googletest.git /dependencies/googletest && \
99+
cd /dependencies/googletest && git checkout ${GTEST_VERSION} && \
100+
mkdir build && cd build && \
99101
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
100102
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
101103
-DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 .. && \
@@ -107,26 +109,46 @@ RUN git clone -b ${GTEST_VERSION} https://github.com/google/googletest.git /depe
107109
-DABSL_USE_EXTERNAL_GOOGLETEST=ON \
108110
-DABSL_FIND_GOOGLETEST=ON -DCMAKE_CXX_STANDARD=17 .. && \
109111
make ${BUILD_THREADS} && make install && ldconfig /opt/dist/usr/local/lib && \
110-
git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git /dependencies/protobuf && \
111-
cd /dependencies/protobuf && \
112+
git clone --recurse-submodules https://github.com/protocolbuffers/protobuf.git /dependencies/protobuf && \
113+
cd /dependencies/protobuf && git checkout ${PROTOBUF_VERSION} && \
112114
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
113115
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
114116
-Dprotobuf_ABSL_PROVIDER=package \
117+
-Dprotobuf_GTEST_PROVIDER=package \
115118
-Dprotobuf_BUILD_TESTS=ON \
116119
-Dabsl_DIR=/opt/dist/usr/local/lib/cmake/absl . && \
117120
make ${BUILD_THREADS} && make install
118121
# -DBUILD_SHARED_LIBS=ON \
119122

123+
# AUTOCONF VERSION FOR NEO4J
124+
# hadolint ignore=DL3003,SC2086
125+
RUN curl -O https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.xz && \
126+
tar -xf autoconf-${AUTOCONF_VERSION}.tar.xz && cd autoconf-${AUTOCONF_VERSION} && \
127+
./configure && make ${BUILD_THREADS} && make install DESTDIR=/opt/dist && make install
128+
120129
# gRPC
121-
RUN git clone -b ${GRPC_VERSION} https://github.com/grpc/grpc /dependencies/grpc && \
130+
RUN ldconfig && git clone -b ${GRPC_VERSION} --depth 1 --recursive https://github.com/grpc/grpc /dependencies/grpc && \
122131
cd /dependencies/grpc && \
123-
git submodule update --init && mkdir -p cmake/build && cd cmake/build && \
132+
mkdir -p cmake/build && cd cmake/build && \
124133
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON \
125-
-DCMAKE_CXX_STANDARD=17 -DgRPC_INSTALL=ON \
134+
-DCMAKE_CXX_STANDARD=17 -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF \
126135
-DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
127136
-DgRPC_ABSL_PROVIDER=package \
128-
-DgRPC_PROTOBUF_PROVIDER=package ../.. && \
129-
make ${BUILD_THREADS} && make install
137+
-DgRPC_PROTOBUF_PROVIDER=package \
138+
-DgRPC_CARES_PROVIDER=module \
139+
-DgRPC_RE2_PROVIDER=module \
140+
-DgRPC_SSL_PROVIDER=module \
141+
-DgRPC_ZLIB_PROVIDER=module \
142+
-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON \
143+
-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF \
144+
-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF \
145+
-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF \
146+
-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON \
147+
-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF \
148+
-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF \
149+
../.. && \
150+
cmake --build . -- -j && cmake --install .
151+
# make ${BUILD_THREADS} && make install
130152

131153
# OPENCV
132154
# hadolint ignore=DL3003,SC2086
@@ -167,9 +189,9 @@ RUN curl -L -O https://github.com/TileDB-Inc/TileDB/archive/refs/tags/${TILEDB_V
167189

168190
# AUTOCONF VERSION FOR NEO4J
169191
# hadolint ignore=DL3003,SC2086
170-
RUN curl -O https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.xz && \
171-
tar -xf autoconf-${AUTOCONF_VERSION}.tar.xz && cd autoconf-${AUTOCONF_VERSION} && \
172-
./configure && make ${BUILD_THREADS} && make install DESTDIR=/opt/dist && make install
192+
# RUN curl -O https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.xz && \
193+
# tar -xf autoconf-${AUTOCONF_VERSION}.tar.xz && cd autoconf-${AUTOCONF_VERSION} && \
194+
# ./configure && make ${BUILD_THREADS} && make install DESTDIR=/opt/dist && make install
173195

174196
# LIB-OMNI FOR NEO4J QUERY HANDLER
175197
# hadolint ignore=DL3003,SC2086

0 commit comments

Comments
 (0)