Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ jobs:
# Add the target for any images that shouldn't be build as multi-platform
# into the skip list
echo "$METADATA" | jq -r 'def skip: ["ubuntu", "fedora"];
. | to_entries[] | .key | split("-")[0] |
. | to_entries[] | select(.value | has("image.name")) |
.key | split("-")[0] |
if . as $name | skip | index($name) != null then empty else . end' | \
while read -r image_name; do
touch "$image_name"
Expand Down
12 changes: 8 additions & 4 deletions scripts/docker/centos-multi.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ CMD ["/bin/bash"]
########################
FROM base-image AS pyvelox

ENV LD_LIBRARY_PATH="/usr/local/lib:/usr/local/lib64:$LD_LIBRARY_PATH"
RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/velox_deps.conf \
&& echo "/usr/local/lib64" >> /etc/ld.so.conf.d/velox_deps.conf \
&& ldconfig

########################
# Stage: Adapters Build#
Expand Down Expand Up @@ -163,11 +165,13 @@ ENV HADOOP_HOME=/usr/local/hadoop \
JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk \
PATH=/usr/lib/jvm/java-1.8.0-openjdk/bin:${PATH}

# thrift1 requires shared libraries copied from /deps to /usr/local.
ENV LD_LIBRARY_PATH="/usr/local/lib:/usr/local/lib64:$LD_LIBRARY_PATH"

COPY --from=adapters-build /deps /usr/local

# thrift1 requires shared libraries copied from /deps to /usr/local.
RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/velox_deps.conf \
&& echo "/usr/local/lib64" >> /etc/ld.so.conf.d/velox_deps.conf \
&& ldconfig

COPY scripts/setup-classpath.sh /
ENTRYPOINT ["/bin/bash", "-c", "source /setup-classpath.sh && source /opt/rh/gcc-toolset-12/enable && exec \"$@\"", "--"]
CMD ["/bin/bash"]
Loading