Skip to content

chore(ci): Update integration dockerfile for updated image setup #876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paleolimbot merged 6 commits into from
Apr 20, 2026
+19 −10
Merged

chore(ci): Update integration dockerfile for updated image setup #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
caaa018
try a fix
paleolimbot Apr 18, 2026
c582680
add go
paleolimbot Apr 18, 2026
160c572
fixes
paleolimbot Apr 18, 2026
181e868
undo previous fixes
paleolimbot Apr 18, 2026
80107a9
maybe add back
paleolimbot Apr 19, 2026
b6a3df8
try maybe with envs sorted
paleolimbot Apr 19, 2026
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
15 changes: 9 additions & 6 deletions ci/docker/integration.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
FROM apache/arrow-dev:amd64-conda-integration

ENV ARROW_USE_CCACHE=OFF \
ARROW_CPP_EXE_PATH=/build/cpp/debug \
ARROW_NANOARROW_PATH=/build/nanoarrow \
ARROW_RUST_EXE_PATH=/build/rust/debug \
BUILD_DOCS_CPP=OFF \
Expand Down Expand Up @@ -61,8 +60,12 @@ RUN git clone https://github.com/apache/arrow-js.git /arrow-integration/js --dep
RUN git clone https://github.com/apache/arrow-rs.git /arrow-integration/rust --depth 1

# Build all the integrations except nanoarrow (since we'll do that ourselves on each run)
RUN ARCHERY_INTEGRATION_WITH_NANOARROW="0" \
conda run --no-capture-output \
/arrow-integration/ci/scripts/integration_arrow_build.sh \
/arrow-integration \
/build
# Activate conda environment directly instead of using conda run, which has issues with
# environment variables being inherited from base instead of the target environment.
# Also add cargo/bin back to PATH since conda activation may not include it.
SHELL ["/bin/bash", "-c"]
RUN source /opt/conda/etc/profile.d/conda.sh && \
conda activate arrow && \
export PATH="/root/.cargo/bin:$PATH" && \
ARCHERY_INTEGRATION_WITH_NANOARROW="0" \
/arrow-integration/ci/scripts/integration_arrow_build.sh /arrow-integration /build
14 changes: 10 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,16 @@ services:
environment:
ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS: "nanoarrow"
ARCHERY_INTEGRATION_WITH_RUST: "1"
# Activate conda environment directly instead of using conda run, which has issues with
# environment variables being inherited from base instead of the target environment.
# Also add cargo/bin back to PATH since conda activation may not include it.
entrypoint: ["/bin/bash", "-c"]
command:
["echo '::group::Build nanoarrow' &&
conda run --no-capture-output /arrow-integration/ci/scripts/nanoarrow_build.sh /arrow-integration /build &&
- |
source /opt/conda/etc/profile.d/conda.sh && conda activate arrow && export PATH=/root/.cargo/bin:$$PATH &&
echo '::group::Build nanoarrow' &&
/arrow-integration/ci/scripts/nanoarrow_build.sh /arrow-integration /build &&
echo '::endgroup::' &&
echo '::group::Run integration tests' &&
conda run --no-capture-output /arrow-integration/ci/scripts/integration_arrow.sh /arrow-integration /build &&
echo '::endgroup::'"]
/arrow-integration/ci/scripts/integration_arrow.sh /arrow-integration /build &&
echo '::endgroup::'
Loading