Skip to content

Commit d68e988

Browse files
committed
[native] Fix docker dependency image build
A recent change in Velox requires a specific patch file for the arrow setup to be present in the script directory. Otherwise, the arrow build fails due to the file not being found.
1 parent 5b72dbf commit d68e988

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

presto-native-execution/scripts/dockerfiles/centos-dependency.dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ ENV CXX=/opt/rh/gcc-toolset-12/root/bin/g++
1919
RUN mkdir -p /scripts /velox/scripts
2020
COPY scripts /scripts
2121
COPY velox/scripts /velox/scripts
22+
# Copy extra script called during setup.
23+
# from https://github.com/facebookincubator/velox/pull/14016
24+
COPY velox/CMake/resolve_dependency_modules/arrow/cmake-compatibility.patch /velox
25+
ENV VELOX_ARROW_CMAKE_PATCH=/velox/cmake-compatibility.patch
2226
RUN bash -c "mkdir build && \
2327
(cd build && ../scripts/setup-centos.sh && \
2428
../velox/scripts/setup-centos9.sh install_adapters && \

presto-native-execution/scripts/dockerfiles/ubuntu-22.04-dependency.dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ ENV TZ=${tz}
2626
RUN mkdir -p /scripts /velox/scripts
2727
COPY scripts /scripts
2828
COPY velox/scripts /velox/scripts
29+
# Copy extra script called during setup.
30+
# from https://github.com/facebookincubator/velox/pull/14016
31+
COPY velox/CMake/resolve_dependency_modules/arrow/cmake-compatibility.patch /velox
32+
ENV VELOX_ARROW_CMAKE_PATCH=/velox/cmake-compatibility.patch
2933
# install rpm needed for minio install.
3034
RUN mkdir build && \
3135
(cd build && ../scripts/setup-ubuntu.sh && \

0 commit comments

Comments
 (0)