Update the Docker image to manylinux

Author: niess

.travis.yml

@@ -19,6 +19,7 @@ install:
 
 script:
   - docker run --cap-add SYS_ADMIN --device /dev/fuse --mount src=$PWD,dst=/work,type=bind ${DOCKER_USERNAME}/linuxdeploy-plugin-python:${ARCH}
+  - python3 -m tests
 
 after_success:
   - ./.travis/after-success.sh

.travis/Dockerfile

@@ -1,27 +1,23 @@
-FROM ubuntu:trusty
+FROM quay.io/pypa/manylinux2010_x86_64
 LABEL maintainer="https://github.com/niess"
 
 ARG Arch=x86_64
 ENV ARCH="${Arch}"                                                             \
-    OPENSSL="1.1.1c"                                                           \
-    OPENSSL_DIR="${HOME}/openssl/${OPENSSL}${CONFIG_HASH}"
+    OPENSSL="1.1.1c"
 
-RUN apt update -y -qq                                                       && \
-    apt install --no-install-recommends -y -qq                                 \
-        build-essential libssl-dev zlib1g-dev libncurses5-dev libncursesw5-dev \
-        libreadline-dev libsqlite3-dev libgdbm-dev libdb5.3-dev libbz2-dev     \
-        libexpat1-dev liblzma-dev libffi-dev tk-dev automake libfuse2 wget  && \
-    rm -rf /var/lib/apt/lists/*
+RUN yum -y install bzip2-devel fuse-sshfs ncurses-devel readline-devel         \
+                   sqlite-devel openssl-devel symlinks tk-devel xz-devel wget
 
 COPY . /work/.travis
 WORKDIR /work
 SHELL ["/bin/bash", "-c"]
 
+ENV OPENSSL_DIR="${HOME}/openssl/${OPENSSL}"
 RUN ./.travis/install.sh
 
 ENV PATH="${OPENSSL_DIR}/bin:${PATH}"                                          \
     CFLAGS="${CFLAGS} -I${OPENSSL_DIR}/include"                                \
-    LDFLAGS="-L${OPENSSL_DIR}/lib -Wl,-rpath=${OPENSSL_DIR}/lib"               \
+    LDFLAGS="-L${OPENSSL_DIR}/lib"                                             \
     LD_LIBRARY_PATH="${OPENSSL_DIR}/lib:${LD_LIBRARY_PATH}"
 
 CMD ["./.travis/script.sh"]

.travis/script.sh

@@ -21,5 +21,3 @@ wrapped_run python python2
 wrapped_run python python3
 wrapped_run python scipy
 wrapped_run python xonsh
-
-python3 -m tests

linuxdeploy-plugin-python.sh

@@ -48,6 +48,9 @@ show_usage () {
     echo "      Provide extra configuration flags for the Python build. Note"
     echo "      that the install prefix will be overwritten"
     echo ""
+    echo "  PYTHON_ENTRYPOINT=\"${PYTHON_ENTRYPOINT}\""
+    echo "      Extra options when calling the python executable"
+    echo ""
     echo "  PYTHON_SOURCE=\"${PYTHON_SOURCE}\""
     echo "      The source to use for Python. Can be a directory, an url or/and"
     echo "      an archive"
@@ -122,7 +125,7 @@ fi
 
 prefix="usr/python"
 cd "${source_dir}"
-./configure ${PYTHON_CONFIG} "--with-ensurepip=install" "--prefix=/${prefix}"
+./configure ${PYTHON_CONFIG} "--with-ensurepip=install" "--prefix=/${prefix}" LDFLAGS="${LDFLAGS} -Wl,-rpath='"'$$ORIGIN'"/../../lib'"
 HOME="${PYTHON_BUILD_DIR}" make -j"$NPROC" DESTDIR="$APPDIR" install
 
 
@@ -194,11 +197,16 @@ patch_binary() {
     local name="$(basename $1)"
 
     if [ "${name::3}" == "lib" ]; then
-        if [ ! -f "${APPDIR}/usr/lib/${name}" ]; then
+        if [ ! -f "${APPDIR}/usr/lib/${name}" ] && [ ! -L "${APPDIR}/usr/lib/${name}" ]; then
             echo "Patching dependency ${name}"
             strip "$1"
             "${patchelf}" --set-rpath '$ORIGIN' "$1"
-            ln -rs "$1" "${APPDIR}/usr/lib"
+            if [ "$(command -v symlinks)" ]; then
+                ln -s "$1" "${APPDIR}/usr/lib/${name}"
+                symlinks -c "${APPDIR}/usr/lib/${name}"
+            else
+                ln -rs "$1" "${APPDIR}/usr/lib"
+            fi
         fi
     else
         echo "Patching C-extension module ${name}"
@@ -238,7 +246,16 @@ find "site-packages" -name 'lib*.so*' -type f | while read file; do patch_binary
 
 
 # Copy any TCl/Tk shared data
-if [[ -d "/usr/share/tcltk" ]] && [[ ! -d "${APPDIR}/${prefix}/share/tcltk" ]]; then
-    mkdir -p "${APPDIR}/${prefix}/share"
-    cp -r "/usr/share/tcltk" "${APPDIR}/${prefix}/share"
+if [[ ! -d "${APPDIR}/${prefix}/share/tcltk" ]]; then
+    if [[ -d "/usr/share/tcltk" ]]; then
+        mkdir -p "${APPDIR}/${prefix}/share"
+        cp -r "/usr/share/tcltk" "${APPDIR}/${prefix}/share"
+    else
+        mkdir -p "${APPDIR}/${prefix}/share/tcltk"
+        tclpath="$(ls -d /usr/share/tcl* | tail -1)"
+        tkpath="$(ls -d /usr/share/tk* | tail -1)"
+        for path in "${tclpath}" "${tkpath}"; do
+            cp -r "${path}" "${APPDIR}/${prefix}/share/tcltk"
+        done
+    fi
 fi

share/python-wrapper.sh

@@ -6,8 +6,8 @@ APPDIR="${APPDIR:-$SCRIPTPATH/../..}"
 
 # Configure the environment
 prefix="{{PREFIX}}"
-export TCL_LIBRARY="${APPDIR}/${prefix}/share/tcltk/tcl"*
-export TK_LIBRARY="${APPDIR}/${prefix}/share/tcltk/tk"*
+export TCL_LIBRARY="$(ls -d ${APPDIR}/${prefix}/share/tcltk/tcl* | tail -1)"
+export TK_LIBRARY="$(ls -d ${APPDIR}/${prefix}/share/tcltk/tk* | tail -1)"
 export TKPATH="${TK_LIBRARY}"
 
 # Resolve symlinks within the image