diff --git a/velox/docker/adapters_build.dockerfile b/velox/docker/adapters_build.dockerfile index 7397c7dd..9824bd8b 100644 --- a/velox/docker/adapters_build.dockerfile +++ b/velox/docker/adapters_build.dockerfile @@ -1,4 +1,4 @@ -FROM velox-adapters-deps:centos9 +FROM ghcr.io/facebookincubator/velox-dev:adapters # Build-time configuration, these may be overridden in the docker compose yaml, # environment variables, or via the docker build command @@ -18,7 +18,6 @@ ARG SCCACHE_DISABLE_DIST=ON ENV VELOX_DEPENDENCY_SOURCE=SYSTEM \ GTest_SOURCE=BUNDLED \ cudf_SOURCE=BUNDLED \ - simdjson_SOURCE=BUNDLED \ faiss_SOURCE=BUNDLED \ CUDA_VERSION=${CUDA_VERSION} \ TREAT_WARNINGS_AS_ERRORS=${TREAT_WARNINGS_AS_ERRORS} \ @@ -48,8 +47,7 @@ ${BUILD_BASE_DIR}/${BUILD_TYPE}/_deps/rapids_logger-build:\ ${BUILD_BASE_DIR}/${BUILD_TYPE}/_deps/kvikio-build:\ ${BUILD_BASE_DIR}/${BUILD_TYPE}/_deps/nvcomp_proprietary_binary-src/lib64" \ ENABLE_SCCACHE=${ENABLE_SCCACHE} \ - SCCACHE_DISABLE_DIST=${SCCACHE_DISABLE_DIST} \ - CCACHE_DIR=/ccache + SCCACHE_DISABLE_DIST=${SCCACHE_DISABLE_DIST} WORKDIR /workspace/velox @@ -94,7 +92,6 @@ COPY velox-testing/velox/docker/sccache/sccache_auth/ /sccache_auth/ # Build in Release mode into ${BUILD_BASE_DIR} RUN --mount=type=bind,source=velox,target=/workspace/velox,ro \ - --mount=type=cache,target=/ccache \ set -euxo pipefail && \ # Configure sccache if enabled if [ "$ENABLE_SCCACHE" = "ON" ]; then \ diff --git a/velox/docker/adapters_deps.dockerfile b/velox/docker/adapters_deps.dockerfile deleted file mode 100644 index 15542a36..00000000 --- a/velox/docker/adapters_deps.dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ghcr.io/facebookincubator/velox-dev:adapters - -ARG CUDA_VERSION=12.8 - -# Copy and run CentOS adapters setup script -COPY velox/scripts/ /scripts - -RUN set -euxo pipefail && \ - if ! dnf list installed cuda-nvcc-$(echo ${CUDA_VERSION} | tr '.' '-') 1>/dev/null || \ - ! dnf list installed libnvjitlink-devel-$(echo ${CUDA_VERSION} | tr '.' '-') 1>/dev/null; then \ - bash -c "source /scripts/setup-centos-adapters.sh && install_cuda ${CUDA_VERSION}"; \ - fi && \ - pip install cmake==3.30.4 diff --git a/velox/docker/docker-compose.adapters.build.yml b/velox/docker/docker-compose.adapters.build.yml index e251f99d..62c48101 100644 --- a/velox/docker/docker-compose.adapters.build.yml +++ b/velox/docker/docker-compose.adapters.build.yml @@ -1,10 +1,4 @@ services: - velox-adapters-deps: - container_name: velox-adapters-deps - image: velox-adapters-deps:centos9 - build: - context: ../../.. - dockerfile: velox-testing/velox/docker/adapters_deps.dockerfile velox-adapters-build: container_name: velox-adapters-build image: velox-adapters-build:latest diff --git a/velox/scripts/build_centos_deps_image.sh b/velox/scripts/build_centos_deps_image.sh index fbe0632a..7c169c87 100755 --- a/velox/scripts/build_centos_deps_image.sh +++ b/velox/scripts/build_centos_deps_image.sh @@ -1,8 +1,11 @@ #!/bin/bash set -e -container_name="velox-adapters-deps" -compose_file="../docker/docker-compose.adapters.build.yml" -docker compose -f "${compose_file}" up "${container_name}" -docker compose -f "${compose_file}" down "${container_name}" + +echo "Building Velox dependencies/run-time container image..." + +pushd ../../../velox +docker compose -f docker-compose.yml --progress plain build adapters-cpp +popd + echo "Velox dependencies/run-time container image built!" diff --git a/velox/scripts/build_velox.sh b/velox/scripts/build_velox.sh index bea55fcf..15bde946 100755 --- a/velox/scripts/build_velox.sh +++ b/velox/scripts/build_velox.sh @@ -40,7 +40,6 @@ cleanup_sccache_auth() { trap cleanup_sccache_auth EXIT SIGTERM SIGINT SIGQUIT - print_help() { cat <