diff --git a/common.docker b/common.docker index 62a36c6..fe03864 100644 --- a/common.docker +++ b/common.docker @@ -1,7 +1,7 @@ WORKDIR /usr/src -ARG GIT_VERSION=2.31.1 -ARG CMAKE_VERSION=3.17.1 +ARG GIT_VERSION=2.32.0 +ARG CMAKE_VERSION=3.20.5 # Image build scripts COPY \ diff --git a/imagefiles/install-cmake-binary.sh b/imagefiles/install-cmake-binary.sh index 9c34087..1cc5304 100755 --- a/imagefiles/install-cmake-binary.sh +++ b/imagefiles/install-cmake-binary.sh @@ -35,11 +35,26 @@ fi cd /usr/src -CMAKE_ROOT=cmake-${CMAKE_VERSION}-Centos5-${ARCH} -url=https://github.com/dockbuild/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ROOT}.tar.gz +#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 + 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