Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
runs-on: ubuntu-latest
title: AMD64 Ubuntu 24.04 C++ ASAN UBSAN
ubuntu: 24.04
- arch: arm64v8
- arch: arm64/v8
clang-tools: 18
image: ubuntu-cpp
llvm: 18
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cpp_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ jobs:
platform:
- arch: "amd64"
runs-on: ubuntu-latest
- arch: "arm64v8"
- arch: "arm64/v8"
runs-on: ubuntu-24.04-arm
env:
ARCH: ${{ matrix.platform.arch }}
Expand Down Expand Up @@ -584,7 +584,7 @@ jobs:
ARROW_BUILD_STATIC: OFF
ARROW_BUILD_TESTS: ON
ARROW_BUILD_TYPE: release
# Turn Arrow CSV off to disable `find_package(Arrow)` check on MSVC CI.
# Turn Arrow CSV off to disable `find_package(Arrow)` check on MSVC CI.
# GH-49050 TODO: enable `find_package(Arrow)` check on MSVC CI.
ARROW_CSV: OFF
ARROW_DEPENDENCY_SOURCE: VCPKG
Expand Down
1 change: 1 addition & 0 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ ignored:
- DL3018
- DL3028 # Ruby gem version pinning
- DL3007 # r-sanitizer must use latest
- DL3029 # Do not use --platform flag with FROM
- DL3041 # Specify version with `dnf install -y <package>-<version>`.
2 changes: 1 addition & 1 deletion ci/docker/almalinux-10-verify-rc.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

ARG arch=amd64
FROM ${arch}/almalinux:10
FROM --platform=linux/${arch} almalinux:10

COPY dev/release/setup-rhel-rebuilds.sh /
RUN /setup-rhel-rebuilds.sh && \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/almalinux-8-verify-rc.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

ARG arch=amd64
FROM ${arch}/almalinux:8
FROM --platform=linux/${arch} almalinux:8

COPY dev/release/setup-rhel-rebuilds.sh /
RUN /setup-rhel-rebuilds.sh && \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/alpine-linux-3.22-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

ARG arch=amd64
FROM ${arch}/alpine:3.22
FROM --platform=linux/${arch} alpine:3.22

RUN apk add \
apache-orc-dev \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/alpine-linux-3.22-r.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Replicates CRAN's Alpine environment as closely as possible

ARG arch=amd64
FROM ${arch}/alpine:3.22
FROM --platform=linux/${arch} alpine:3.22

# Install R and essential build tools
# Note: bash is needed for Arrow CI scripts, even though CRAN's Alpine uses BusyBox
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/conda-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

ARG repo
ARG arch
FROM ${repo}:${arch}-conda
ARG arch_short
FROM --platform=linux/${arch} ${repo}:${arch_short}-conda

COPY ci/scripts/install_minio.sh /arrow/ci/scripts
RUN /arrow/ci/scripts/install_minio.sh latest /opt/conda
Expand Down
6 changes: 3 additions & 3 deletions ci/docker/conda-integration.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
# under the License.

ARG repo
ARG arch=amd64
FROM ${repo}:${arch}-conda-cpp
ARG arch
ARG arch_short
FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-cpp

ARG arch=amd64
# We need to synchronize the following values with the values in .env
# and services.conda-integration in compose.yaml.
ARG maven=3.9.9
Expand Down
5 changes: 3 additions & 2 deletions ci/docker/conda-python-dask.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
# under the License.

ARG repo
ARG arch=amd64
ARG arch
ARG arch_short
ARG python=3.10
FROM ${repo}:${arch}-conda-python-${python}
FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-python-${python}

ARG dask=latest
COPY ci/scripts/install_dask.sh /arrow/ci/scripts/
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/conda-python-emscripten.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@

ARG repo
ARG arch
ARG arch_short
ARG python="3.12"
FROM ${repo}:${arch}-conda-python-${python}
FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-python-${python}

ARG selenium_version="4.41.0"
ARG pyodide_version="0.26.0"
Expand Down
5 changes: 3 additions & 2 deletions ci/docker/conda-python-hdfs.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
# under the License.

ARG repo
ARG arch=amd64
ARG arch
ARG arch_short
ARG python=3.10
FROM ${repo}:${arch}-conda-python-${python}
FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-python-${python}

ARG jdk=11
ARG maven=3.9.9
Expand Down
5 changes: 3 additions & 2 deletions ci/docker/conda-python-jpype.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
# under the License.

ARG repo
ARG arch=amd64
ARG arch
ARG arch_short
ARG python=3.10
FROM ${repo}:${arch}-conda-python-${python}
FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-python-${python}

ARG jdk=11
ARG maven=3.9.9
Expand Down
5 changes: 3 additions & 2 deletions ci/docker/conda-python-pandas.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
# under the License.

ARG repo
ARG arch=amd64
ARG arch
ARG arch_short
ARG python=3.10
FROM ${repo}:${arch}-conda-python-${python}
FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-python-${python}

ARG pandas=latest
ARG numpy=latest
Expand Down
5 changes: 3 additions & 2 deletions ci/docker/conda-python-spark.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
# under the License.

ARG repo
ARG arch=amd64
ARG arch
ARG arch_short
ARG python=3.10
FROM ${repo}:${arch}-conda-python-${python}
FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-python-${python}

ARG jdk=11
ARG maven=3.9.9
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/conda-python.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

ARG repo
ARG arch
FROM ${repo}:${arch}-conda-cpp
ARG arch_short
FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-cpp

# install python specific packages
ARG python=3.10
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/conda.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

ARG arch=amd64
FROM ${arch}/ubuntu:22.04
FROM --platform=linux/${arch} ubuntu:24.04

# install build essentials
RUN export DEBIAN_FRONTEND=noninteractive && \
Expand Down
3 changes: 1 addition & 2 deletions ci/docker/debian-13-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
# under the License.

ARG arch=amd64
FROM ${arch}/debian:13
ARG arch
FROM --platform=linux/${arch} debian:13

ENV DEBIAN_FRONTEND noninteractive

Expand Down
3 changes: 1 addition & 2 deletions ci/docker/debian-experimental-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
# under the License.

ARG arch=amd64
FROM ${arch}/debian:experimental
ARG arch
FROM --platform=linux/${arch} debian:experimental

ENV DEBIAN_FRONTEND noninteractive

Expand Down
3 changes: 1 addition & 2 deletions ci/docker/fedora-42-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
# under the License.

ARG arch
FROM ${arch}/fedora:42
ARG arch
FROM --platform=linux/${arch} fedora:42

# install dependencies
RUN dnf update -y && \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/fedora-42-r-clang.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# See: https://www.stats.ox.ac.uk/pub/bdr/Rconfig/r-devel-linux-x86_64-fedora-clang

ARG arch=amd64
FROM ${arch}/fedora:42
FROM --platform=linux/${arch} fedora:42

# Install build dependencies
RUN dnf update -y && \
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/linux-apt-c-glib.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.

ARG arch
ARG base
FROM ${base}
FROM --platform=linux/${arch} ${base}

RUN apt-get update -y -q && \
apt-get install -y -q \
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/linux-apt-python-3.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.

ARG arch
ARG base
FROM ${base}
FROM --platform=linux/${arch} ${base}

COPY python/requirements-build.txt \
python/requirements-test.txt \
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/linux-apt-r.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.

ARG arch
ARG base
FROM ${base}
FROM --platform=linux/${arch} ${base}

ARG tz="UTC"
ENV TZ=${tz}
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/linux-apt-ruby.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
# under the License.

# depends on a C GLib image
ARG arch
ARG base
FROM ${base}
FROM --platform=linux/${arch} ${base}

COPY ruby/ /arrow/ruby/
RUN bundle install --gemfile /arrow/ruby/Gemfile
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/linux-dnf-python-3.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.

ARG arch
ARG base
FROM ${base}
FROM --platform=linux/${arch} ${base}

RUN dnf install -y \
python3 \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/python-wheel-manylinux-test.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

ARG arch
ARG python_image_tag
FROM ${arch}/python:${python_image_tag}
FROM --platform=linux/${arch} python:${python_image_tag}

# pandas doesn't provide wheel for aarch64 yet, so cache the compiled
# test dependencies in a docker image
Expand Down
5 changes: 3 additions & 2 deletions ci/docker/ubuntu-22.04-cpp-minimal.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.

ARG base=amd64/ubuntu:22.04
FROM ${base}
ARG arch=amd64
ARG base=ubuntu:22.04
FROM --platform=linux/${arch} ${base}
Comment on lines +19 to +20

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can always use ubuntu:22.04 because this Dockerfile is only for Ubuntu 22.04.

Suggested change
ARG base=ubuntu:22.04
FROM --platform=linux/${arch} ${base}
FROM --platform=linux/${arch} ubuntu:22.04

@pitrou pitrou Jun 10, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our Ubuntu dockerfiles are also used for CUDA and in that case they use a different base.


SHELL ["/bin/bash", "-o", "pipefail", "-c"]

Expand Down
5 changes: 3 additions & 2 deletions ci/docker/ubuntu-22.04-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.

ARG base=amd64/ubuntu:22.04
FROM ${base}
ARG arch=amd64
ARG base=ubuntu:22.04
FROM --platform=linux/${arch} ${base}
Comment on lines +19 to +20

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ARG base=ubuntu:22.04
FROM --platform=linux/${arch} ${base}
FROM --platform=linux/${arch} ubuntu:22.04


SHELL ["/bin/bash", "-o", "pipefail", "-c"]

Expand Down
3 changes: 2 additions & 1 deletion ci/docker/ubuntu-22.04-verify-rc.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
# under the License.

ARG arch=amd64
FROM ${arch}/ubuntu:22.04
ARG base=ubuntu:22.04
FROM --platform=linux/${arch} ${base}
Comment on lines +19 to +20

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ARG base=ubuntu:22.04
FROM --platform=linux/${arch} ${base}
FROM --platform=linux/${arch} ubuntu:22.04


ENV DEBIAN_FRONTEND=noninteractive
COPY dev/release/setup-ubuntu.sh /
Expand Down
5 changes: 3 additions & 2 deletions ci/docker/ubuntu-24.04-cpp-minimal.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.

ARG base=amd64/ubuntu:24.04
FROM ${base}
ARG arch=amd64
ARG base=ubuntu:24.04
FROM --platform=linux/${arch} ${base}
Comment on lines +19 to +20

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ARG base=ubuntu:24.04
FROM --platform=linux/${arch} ${base}
FROM --platform=linux/${arch} ubuntu:24.04


SHELL ["/bin/bash", "-o", "pipefail", "-c"]

Expand Down
5 changes: 3 additions & 2 deletions ci/docker/ubuntu-24.04-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.

ARG base=amd64/ubuntu:24.04
FROM ${base}
ARG arch=amd64
ARG base=ubuntu:24.04
FROM --platform=linux/${arch} ${base}
Comment on lines +19 to +20

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ARG base=ubuntu:24.04
FROM --platform=linux/${arch} ${base}
FROM --platform=linux/${arch} ubuntu:24.04


SHELL ["/bin/bash", "-o", "pipefail", "-c"]

Expand Down
3 changes: 2 additions & 1 deletion ci/docker/ubuntu-24.04-verify-rc.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
# under the License.

ARG arch=amd64
FROM ${arch}/ubuntu:24.04
ARG base=ubuntu:24.04
FROM --platform=linux/${arch} ${base}
Comment on lines +19 to +20

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ARG base=ubuntu:24.04
FROM --platform=linux/${arch} ${base}
FROM --platform=linux/${arch} ubuntu:24.04


ENV DEBIAN_FRONTEND=noninteractive
COPY dev/release/setup-ubuntu.sh /
Expand Down
Loading
Loading