Skip to content

Commit

Permalink
Fix docker lint
Browse files Browse the repository at this point in the history
  • Loading branch information
pitrou committed Dec 19, 2024
1 parent da27ca9 commit f52b0f7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 3 additions & 4 deletions ci/docker/python-wheel-windows-test-vs2019-base.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,12 @@ RUN wmic product where "name like 'python%%'" call uninstall /nointeractive && \
curl https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2024-09-13T20-26-02Z \
--output "C:\Windows\Minio.exe"

# Install archiver to extract xz archives (for timezone database)
RUN choco install --no-progress -r -y archiver

# Install archiver to extract xz archives (for timezone database).
# Install the GCS testbench using a well-known Python version.
# NOTE: cannot use pipx's `--fetch-missing-python` because of
# https://github.com/pypa/pipx/issues/1521, therefore download Python ourselves.
RUN choco install -r -y --pre --no-progress python --version=3.11.9
RUN choco install --no-progress -r -y archiver && \
choco install -r -y --pre --no-progress python --version=3.11.9
ENV PIPX_BIN_DIR=C:\\Windows\\
ENV PIPX_PYTHON="C:\Python311\python.exe"
COPY ci/scripts/install_gcs_testbench.bat C:/arrow/ci/scripts/
Expand Down
2 changes: 2 additions & 0 deletions ci/docker/python-wheel-windows-test-vs2019.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN (if "%python%"=="3.9" setx PYTHON_VERSION "3.9.13") & \
(if "%python%"=="3.11" setx PYTHON_VERSION "3.11.9") & \
(if "%python%"=="3.12" setx PYTHON_VERSION "3.12.5") & \
(if "%python%"=="3.13" setx PYTHON_VERSION "3.13.0-rc2")

# hadolint ignore=DL3059
RUN choco install -r -y --pre --no-progress --force python --version=%PYTHON_VERSION%

ENV PYTHON=$python

0 comments on commit f52b0f7

Please sign in to comment.