diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 51664b5f048..00a3da83f1f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -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" diff --git a/scripts/docker/centos-multi.dockerfile b/scripts/docker/centos-multi.dockerfile index 862685d7b83..59d9aaedc39 100644 --- a/scripts/docker/centos-multi.dockerfile +++ b/scripts/docker/centos-multi.dockerfile @@ -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# @@ -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"]