From ce521deaebff3f025f8f689e7721dba17da7b637 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 30 Jun 2021 09:07:32 +0200 Subject: [PATCH] Revert "Update CMake to 3.20.5 and git to 2.32.0, update install-cmake-binary.sh script" This reverts commit 969f456ae063e70310ef1859800a201334d78647. --- common.docker | 4 ++-- imagefiles/install-cmake-binary.sh | 19 ++----------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/common.docker b/common.docker index be7c39c..f453d2d 100644 --- a/common.docker +++ b/common.docker @@ -1,7 +1,7 @@ WORKDIR /usr/src -ARG GIT_VERSION=2.32.0 -ARG CMAKE_VERSION=3.20.5 +ARG GIT_VERSION=2.31.1 +ARG CMAKE_VERSION=3.17.1 # Image build scripts COPY \ diff --git a/imagefiles/install-cmake-binary.sh b/imagefiles/install-cmake-binary.sh index 1cc5304..9c34087 100755 --- a/imagefiles/install-cmake-binary.sh +++ b/imagefiles/install-cmake-binary.sh @@ -35,26 +35,11 @@ fi cd /usr/src -#Switch to newer version of CMake -#USER=dockbuild #Original user, change it when changed it when there will be a new update of CMake (3.17.1 on June 27, 2021) - -USER=bensuperpc - -OS=Centos7 - -CMAKE_ROOT=cmake-${CMAKE_VERSION}-${OS}-${ARCH} -url=https://github.com/${USER}/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ROOT}.tar.gz -url_checksum=https://github.com/${USER}/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ROOT}.tar.gz.sha256 - +CMAKE_ROOT=cmake-${CMAKE_VERSION}-Centos5-${ARCH} +url=https://github.com/dockbuild/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ROOT}.tar.gz echo "Downloading $url" curl -# -LO $url -echo "Downloading $url_checksum" -curl -# -LO $url_checksum - -#Checksum package -sha256sum -c ${CMAKE_ROOT}.tar.gz.sha256 - tar -xzvf ${CMAKE_ROOT}.tar.gz rm -f ${CMAKE_ROOT}.tar.gz