This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new acd798c ARROW-3534: [Python] Update zlib library in manylinux1 image
[skip appveyor]
acd798c is described below
commit acd798cbfc6a48dc190e02958729ea3c77f6290c
Author: Krisztián Szűcs <[email protected]>
AuthorDate: Wed Oct 17 13:45:33 2018 +0200
ARROW-3534: [Python] Update zlib library in manylinux1 image [skip appveyor]
This now includes a new zlib version that is bundled as
`pyarrow/./libz-7f57503f.so.1.2.11`. The hash in the name is important so that
it does not collide with system packages.
Author: Krisztián Szűcs <[email protected]>
Author: Korn, Uwe <[email protected]>
Closes #2775 from xhochy/ARROW-3534 and squashes the following commits:
e91c32ef <Krisztián Szűcs> ASF header for .dockerignore
3c41502f <Korn, Uwe> ARROW-3534: Update zlib library in manylinux1 image
---
python/manylinux1/.dockerignore | 18 ++++++++++++++++++
python/manylinux1/Dockerfile-x86_64_base | 5 ++++-
python/manylinux1/scripts/build_zlib.sh | 26 ++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/python/manylinux1/.dockerignore b/python/manylinux1/.dockerignore
new file mode 100644
index 0000000..be421b1
--- /dev/null
+++ b/python/manylinux1/.dockerignore
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+dist/
diff --git a/python/manylinux1/Dockerfile-x86_64_base
b/python/manylinux1/Dockerfile-x86_64_base
index fb4eb1c..cc139f7 100644
--- a/python/manylinux1/Dockerfile-x86_64_base
+++ b/python/manylinux1/Dockerfile-x86_64_base
@@ -17,7 +17,10 @@
FROM quay.io/pypa/manylinux1_x86_64:latest
# Install dependencies
-RUN yum install -y ccache flex zlib-devel wget && yum clean all
+RUN yum install -y ccache flex wget && yum clean all
+
+ADD scripts/build_zlib.sh /
+RUN /build_zlib.sh
ADD scripts/build_openssl.sh /
RUN /build_openssl.sh
diff --git a/python/manylinux1/scripts/build_zlib.sh
b/python/manylinux1/scripts/build_zlib.sh
new file mode 100755
index 0000000..182a42f
--- /dev/null
+++ b/python/manylinux1/scripts/build_zlib.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -ex
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+curl -sL https://zlib.net/zlib-1.2.11.tar.gz -o /zlib-1.2.11.tar.gz
+tar xf zlib-1.2.11.tar.gz
+pushd zlib-1.2.11
+./configure
+make -j4
+make install
+popd
+rm -rf zlib-1.2.11.tar.gz zlib-1.2.11
