From 9f3d8643863db4ab58fdca3f36875be6eddec709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edgar=20Andr=C3=A9s=20Margffoy=20Tuay?= <andfoy@gmail.com>
Date: Fri, 9 Oct 2020 12:20:26 -0500
Subject: [PATCH 1/2] Add libpng build instructions to manylinux image

---
 common/install_libpng.sh | 18 ++++++++++++++++++
 manywheel/Dockerfile     |  5 +++++
 2 files changed, 23 insertions(+)
 create mode 100644 common/install_libpng.sh

diff --git a/common/install_libpng.sh b/common/install_libpng.sh
new file mode 100644
index 000000000..b92829020
--- /dev/null
+++ b/common/install_libpng.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -ex
+
+LIBPNG_VERSION=1.6.37
+
+mkdir -p libpng
+pushd libpng
+
+wget http://download.sourceforge.net/libpng/libpng-$LIBPNG_VERSION.tar.gz
+tar -xvzf libpng-$LIBPNG_VERSION.tar.gz
+
+./configure
+make
+make install
+
+popd
+rm -rf libpng
diff --git a/manywheel/Dockerfile b/manywheel/Dockerfile
index 0475022f5..3927ba705 100644
--- a/manywheel/Dockerfile
+++ b/manywheel/Dockerfile
@@ -66,6 +66,11 @@ ADD ./common/install_jni.sh install_jni.sh
 ADD ./java/jni.h jni.h
 RUN bash ./install_jni.sh && rm install_jni.sh
 
+FROM base as libpng
+# Install libpng
+ADD ./common/install_libpng.sh install_libpng.sh
+RUN bash ./install_libpng.sh && rm install_libpng.sh
+
 FROM ${GPU_IMAGE} as common
 ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8

From ab4d607a9e5245b623cda7fb97735ac3f815979d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edgar=20Andr=C3=A9s=20Margffoy=20Tuay?= <andfoy@gmail.com>
Date: Fri, 9 Oct 2020 14:00:41 -0500
Subject: [PATCH 2/2] Copy stage files

---
 manywheel/Dockerfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/manywheel/Dockerfile b/manywheel/Dockerfile
index 3927ba705..6749a0248 100644
--- a/manywheel/Dockerfile
+++ b/manywheel/Dockerfile
@@ -102,6 +102,12 @@ COPY --from=python   /opt/python/cp36-cp36m/bin/auditwheel /usr/local/bin/auditw
 COPY --from=intel    /opt/intel                            /opt/intel
 COPY --from=patchelf /usr/local/bin/patchelf               /usr/local/bin/patchelf
 COPY --from=jni      /usr/local/include/jni.h              /usr/local/include/jni.h
+COPY --from=libpng   /usr/local/bin/png*                   /usr/local/bin/
+COPY --from=libpng   /usr/local/bin/libpng*                /usr/local/bin/
+COPY --from=libpng   /usr/local/include/png*               /usr/local/include/
+COPY --from=libpng   /usr/local/include/libpng*            /usr/local/include/
+COPY --from=libpng   /usr/local/lib/libpng*                /usr/local/lib/
+COPY --from=libpng   /usr/local/lib/pkgconfig              /usr/local/lib/pkgconfig
 
 FROM common as cuda_final
 ARG BASE_CUDA_VERSION=10.1