Merge branch 'master' into release

Author: thewtex

scripts/dockcross-manylinux-build-module-wheels.sh

@@ -8,11 +8,8 @@
 #
 #   scripts/dockcross-manylinux-build-module-wheels.sh cp35
 
-# Pull dockcross manylinux images
-docker pull dockcross/manylinux1-x64
-
 # Generate dockcross scripts
-docker run dockcross/manylinux1-x64 > /tmp/dockcross-manylinux-x64
+docker run dockcross/manylinux1-x64:20200416-a6b6635 > /tmp/dockcross-manylinux-x64
 chmod u+x /tmp/dockcross-manylinux-x64
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)

scripts/dockcross-manylinux-build-wheels.sh

@@ -7,11 +7,8 @@
 #
 #   scripts/dockcross-manylinux-build-wheels.sh cp35
 
-# Pull dockcross manylinux images
-docker pull dockcross/manylinux1-x64
-
 # Generate dockcross scripts
-docker run dockcross/manylinux1-x64 > /tmp/dockcross-manylinux-x64
+docker run dockcross/manylinux1-x64:20200416-a6b6635 > /tmp/dockcross-manylinux-x64
 chmod u+x /tmp/dockcross-manylinux-x64
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)

scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh

@@ -26,13 +26,14 @@ fi
 
 if [[ ! -f ITKPythonBuilds-linux.tar.zst ]]; then
   curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.1rc02}/ITKPythonBuilds-linux.tar.zst -O
-  ./zstd-1.2.0-linux/bin/unzstd ./ITKPythonBuilds-linux.tar.zst -o ITKPythonBuilds-linux.tar
-  tar xf ITKPythonBuilds-linux.tar
 fi
 if [[ ! -f ./ITKPythonBuilds-linux.tar.zst ]]; then
   echo "ERROR: can not find required binary './ITKPythonBuilds-linux.tar.zst'"
   exit 255
 fi
+./zstd-1.2.0-linux/bin/unzstd ./ITKPythonBuilds-linux.tar.zst -o ITKPythonBuilds-linux.tar
+tar xf ITKPythonBuilds-linux.tar
+rm ITKPythonBuilds-linux.tar
 if [[ ! -f ./ITKPythonPackage/scripts/dockcross-manylinux-build-module-wheels.sh ]]; then
   echo "ERROR: can not find required binary './ITKPythonPackage/scripts/dockcross-manylinux-build-module-wheels.sh'"
   exit 255