diff --git a/common.docker b/common.docker index be7c39c..7ef8a72 100644 --- a/common.docker +++ b/common.docker @@ -23,7 +23,7 @@ RUN \ /buildscripts/build-and-install-openssh.sh && \ /buildscripts/build-and-install-curl.sh && \ /buildscripts/build-and-install-git.sh && \ - /buildscripts/build-and-install-cmake.sh $X86_FLAG && \ + if [ "$CMAKE_BIN" = "true" ]; then CMAKE_VERSION=3.17.1 && /buildscripts/install-cmake-binary.sh $X86_FLAG;else /buildscripts/build-and-install-cmake.sh $X86_FLAG;fi && \ /buildscripts/install-liquidprompt-binary.sh && \ PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \ /buildscripts/install-python-packages.sh -python ${PYTHON} && \ diff --git a/manylinux1-x64/Dockerfile.in b/manylinux1-x64/Dockerfile.in index 4a1f7ea..8d57eb4 100644 --- a/manylinux1-x64/Dockerfile.in +++ b/manylinux1-x64/Dockerfile.in @@ -2,6 +2,7 @@ FROM quay.io/pypa/manylinux1_x86_64:latest MAINTAINER Matt McCormick "matt.mccormick@kitware.com" ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64 +ENV CMAKE_BIN true #include "common.manylinux" diff --git a/manylinux1-x86/Dockerfile.in b/manylinux1-x86/Dockerfile.in index 98eacc2..3ba63be 100644 --- a/manylinux1-x86/Dockerfile.in +++ b/manylinux1-x86/Dockerfile.in @@ -2,6 +2,7 @@ FROM quay.io/pypa/manylinux1_i686:latest MAINTAINER Matt McCormick "matt.mccormick@kitware.com" ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86 +ENV CMAKE_BIN true #include "common.manylinux"