From 3b6915929badf4ac1191f3537e8704845ecf994c Mon Sep 17 00:00:00 2001 From: Matt Topol Date: Mon, 15 Aug 2022 14:38:45 -0400 Subject: [PATCH 1/2] ARROW-17410: [JS][Integration] Downgrade zlib for integration --- ci/docker/conda-integration.dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/docker/conda-integration.dockerfile b/ci/docker/conda-integration.dockerfile index 8bcf5954d1d..a512ae7d6e5 100644 --- a/ci/docker/conda-integration.dockerfile +++ b/ci/docker/conda-integration.dockerfile @@ -35,7 +35,8 @@ RUN mamba install -q -y \ maven=${maven} \ nodejs=${node} \ yarn \ - openjdk=${jdk} && \ + openjdk=${jdk} \ + zlib=1.2.11 && \ mamba clean --all --force-pkgs-dirs # Install Rust with only the needed components From 624b9e775b5344b71d19d32521c436d5091e2007 Mon Sep 17 00:00:00 2001 From: Matt Topol Date: Mon, 15 Aug 2022 14:42:59 -0400 Subject: [PATCH 2/2] add comment --- ci/docker/conda-integration.dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/docker/conda-integration.dockerfile b/ci/docker/conda-integration.dockerfile index a512ae7d6e5..ea1cd672aa1 100644 --- a/ci/docker/conda-integration.dockerfile +++ b/ci/docker/conda-integration.dockerfile @@ -27,6 +27,8 @@ ARG go=1.15 # Install Archery and integration dependencies COPY ci/conda_env_archery.txt /arrow/ci/ + +# Pin zlib to 1.2.11 due to ARROW-17410 until the patch is released RUN mamba install -q -y \ --file arrow/ci/conda_env_archery.txt \ "python>=3.7" \ @@ -36,7 +38,7 @@ RUN mamba install -q -y \ nodejs=${node} \ yarn \ openjdk=${jdk} \ - zlib=1.2.11 && \ + zlib=1.2.11 && \ mamba clean --all --force-pkgs-dirs # Install Rust with only the needed components