This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new d48ea6f0c Fix ballista integration tests (#2441)
d48ea6f0c is described below
commit d48ea6f0c7534b4067b6187299c5aef4b1a08f46
Author: Andy Grove <[email protected]>
AuthorDate: Wed May 4 09:31:37 2022 -0600
Fix ballista integration tests (#2441)
* make dev/build-ballista-docker.sh executable
* update Dockerfile
---
dev/build-ballista-docker.sh | 0
dev/docker/ballista.dockerfile | 18 +++---------------
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/dev/build-ballista-docker.sh b/dev/build-ballista-docker.sh
old mode 100644
new mode 100755
diff --git a/dev/docker/ballista.dockerfile b/dev/docker/ballista.dockerfile
index c452e4684..c56bfecf0 100644
--- a/dev/docker/ballista.dockerfile
+++ b/dev/docker/ballista.dockerfile
@@ -32,13 +32,9 @@ ADD Cargo.toml .
COPY ballista ./ballista/
COPY ballista-examples ./ballista-examples/
COPY benchmarks ./benchmarks/
+COPY data-access ./data-access/
COPY datafusion ./datafusion/
COPY datafusion-cli ./datafusion-cli/
-COPY datafusion-common ./datafusion-common/
-COPY datafusion-expr ./datafusion-expr/
-COPY datafusion-physical-expr ./datafusion-physical-expr/
-COPY datafusion-jit ./datafusion-jit/
-COPY datafusion-proto ./datafusion-proto/
COPY datafusion-examples ./datafusion-examples/
RUN cargo chef prepare --recipe-path recipe.json
@@ -50,25 +46,17 @@ FROM base as builder
RUN mkdir /tmp/ballista/ballista
RUN mkdir /tmp/ballista/ballista-examples
RUN mkdir /tmp/ballista/benchmarks
+RUN mkdir /tmp/ballista/data-access
RUN mkdir /tmp/ballista/datafusion
RUN mkdir /tmp/ballista/datafusion-cli
-RUN mkdir /tmp/ballista/datafusion-common
-RUN mkdir /tmp/ballista/datafusion-expr
-RUN mkdir /tmp/ballista/datafusion-physical-expr
-RUN mkdir /tmp/ballista/datafusion-jit
-RUN mkdir /tmp/ballista/datafusion-proto
RUN mkdir /tmp/ballista/datafusion-examples
ADD Cargo.toml .
COPY ballista ./ballista/
COPY ballista-examples ./ballista-examples/
COPY benchmarks ./benchmarks/
+COPY data-access ./data-access/
COPY datafusion ./datafusion/
COPY datafusion-cli ./datafusion-cli/
-COPY datafusion-common ./datafusion-common/
-COPY datafusion-expr ./datafusion-expr/
-COPY datafusion-physical-expr ./datafusion-physical-expr/
-COPY datafusion-jit ./datafusion-jit/
-COPY datafusion-proto ./datafusion-proto/
COPY datafusion-examples ./datafusion-examples/
COPY --from=cacher /tmp/ballista/target target
ARG RELEASE_FLAG=--release