Revert "Update CMake to 3.20.5 and git to 2.32.0, update install-cmake-binary.sh script"

This reverts commit 969f456ae0.
This commit is contained in:
Bensuperpc 2021-06-30 09:07:32 +02:00
parent 479f1c5d6f
commit ce521deaeb
2 changed files with 4 additions and 19 deletions

View File

@ -1,7 +1,7 @@
WORKDIR /usr/src WORKDIR /usr/src
ARG GIT_VERSION=2.32.0 ARG GIT_VERSION=2.31.1
ARG CMAKE_VERSION=3.20.5 ARG CMAKE_VERSION=3.17.1
# Image build scripts # Image build scripts
COPY \ COPY \

View File

@ -35,26 +35,11 @@ fi
cd /usr/src cd /usr/src
#Switch to newer version of CMake CMAKE_ROOT=cmake-${CMAKE_VERSION}-Centos5-${ARCH}
#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) url=https://github.com/dockbuild/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ROOT}.tar.gz
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
echo "Downloading $url" echo "Downloading $url"
curl -# -LO $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 tar -xzvf ${CMAKE_ROOT}.tar.gz
rm -f ${CMAKE_ROOT}.tar.gz rm -f ${CMAKE_ROOT}.tar.gz