diff --git a/build-libcudf.xml b/build-libcudf.xml index 1f7143bc90..81ffb21c0e 100644 --- a/build-libcudf.xml +++ b/build-libcudf.xml @@ -42,7 +42,7 @@ - + diff --git a/build/Dockerfile.centos7 b/build/Dockerfile.centos7 deleted file mode 100644 index 258060d7db..0000000000 --- a/build/Dockerfile.centos7 +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -### -# Build the image for cudf development environment. -# -# Arguments: CUDA_VERSION=11.5.0 -# -### -ARG CUDA_VERSION=11.5.0 -# use rapids gpuci/cuda images until nvidia/cuda cuda 11.5+ images are available in docker hub -# FROM nvidia/cuda:$CUDA_VERSION-devel-centos7 -FROM cudf-build:$CUDA_VERSION-devel-centos7 - -## install a version of boost that is needed for arrow/parquet to work -RUN cd /usr/local && wget https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.gz && \ - tar -xzf boost_1_79_0.tar.gz && \ - rm boost_1_79_0.tar.gz && \ - cd boost_1_79_0 && \ - ./bootstrap.sh --prefix=/usr/local && \ - ./b2 install --prefix=/usr/local --with-filesystem --with-system && \ - cd /usr/local && \ - rm -rf boost_1_79_0 diff --git a/build/build-in-docker b/build/build-in-docker index bcfe4162d1..462dfdad3b 100755 --- a/build/build-in-docker +++ b/build/build-in-docker @@ -31,7 +31,6 @@ LOCAL_MAVEN_REPO=${LOCAL_MAVEN_REPO:-"$HOME/.m2/repository"} PER_THREAD_DEFAULT_STREAM=${PER_THREAD_DEFAULT_STREAM:-ON} USE_GDS=${USE_GDS:-ON} -CUDF_IMAGE_NAME="cudf-build:${CUDA_VERSION}-devel-centos7" SPARK_IMAGE_NAME="spark-rapids-jni-build:${CUDA_VERSION}-devel-centos7" WORKSPACE_DIR=/rapids WORKSPACE_REPODIR="$WORKSPACE_DIR/spark-rapids-jni" @@ -42,12 +41,7 @@ if (( $# == 0 )); then exit 1 fi -$DOCKER_CMD build -f $REPODIR/thirdparty/cudf/java/ci/Dockerfile.centos7 \ - --build-arg CUDA_VERSION=$CUDA_VERSION \ - -t $CUDF_IMAGE_NAME \ - $REPODIR/thirdparty/cudf/java/ci - -$DOCKER_CMD build -f $REPODIR/build/Dockerfile.centos7 \ +$DOCKER_CMD build -f $REPODIR/ci/Dockerfile \ --build-arg CUDA_VERSION=$CUDA_VERSION \ -t $SPARK_IMAGE_NAME \ $REPODIR/build