Update and fix manylinux 2010-x64 and 2014-aarch64, try to update to newer version of CMake: 3.20.2

common.docker

@@ -2,6 +2,8 @@ WORKDIR /usr/src
 
 ARG GIT_VERSION=2.31.1
 ARG CMAKE_VERSION=3.17.1
+# Version from official repos
+ARG CMAKE_VERSION_OFF=3.20.2
 
 # Image build scripts
 COPY \

imagefiles/build-and-install-cmake.sh

@@ -22,14 +22,14 @@ if ! command -v git &> /dev/null; then
 	exit 1
 fi
 
-if [[ "${CMAKE_VERSION}" == "" ]]; then
+if [[ "${CMAKE_VERSION_OFF}" == "" ]]; then
-  echo >&2 'error: CMAKE_VERSION env. variable must be set to a non-empty value'
+  echo >&2 'error: CMAKE_VERSION_OFF env. variable must be set to a non-empty value'
   exit 1
 fi
 
 cd /usr/src
 
-git clone https://gitlab.kitware.com/cmake/cmake.git CMake -b v$CMAKE_VERSION --depth 1
+git clone https://gitlab.kitware.com/cmake/cmake.git CMake -b v$CMAKE_VERSION_OFF --depth 1
 
 mkdir /usr/src/CMake-build
 cd /usr/src/CMake-build
@@ -44,14 +44,14 @@ cd /usr/src/CMake-ssl-build
 ${WRAPPER} /usr/src/CMake-build/bin/cmake \
   -DCMAKE_BUILD_TYPE:STRING=Release \
   -DBUILD_TESTING:BOOL=OFF \
-  -DCMAKE_INSTALL_PREFIX:PATH=/usr/src/cmake-$CMAKE_VERSION \
+  -DCMAKE_INSTALL_PREFIX:PATH=/usr/src/cmake-$CMAKE_VERSION_OFF \
   -DCMAKE_USE_OPENSSL:BOOL=ON \
   -DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl \
   ../CMake
 ${WRAPPER} make -j$(grep -c processor /proc/cpuinfo) install
 
 # Cleanup install tree
-cd /usr/src/cmake-$CMAKE_VERSION
+cd /usr/src/cmake-$CMAKE_VERSION_OFF
 rm -rf doc man
 
 # Install files

manylinux2010-x64/Dockerfile.in

@@ -42,7 +42,7 @@ COPY manylinux-common/pre_exec.sh /dockcross/
 #include "common.docker"
 WORKDIR /usr/src
 
-ARG GIT_VERSION=2.22.0
+ARG GIT_VERSION=2.31.1
 ARG CMAKE_VERSION=3.17.1
 
 # Image build scripts