Merge pull request #693 from bensuperpc/update_scripts_2

Update scripts and software

common/common.docker

@@ -1,9 +1,21 @@
 WORKDIR /usr/src
 
-ARG GIT_VERSION=2.32.0
-ARG CMAKE_VERSION=3.21.1
+ARG GIT_VERSION=2.36.1
+
+ARG CMAKE_VERSION=3.23.1
+
+ARG NINJA_VERSION=1.11.0
 ARG FLATCC_VERSION=0.6.1
 
+ARG OPENSSL_VERSION=openssl-1.1.1o
+ARG OPENSSL_HASH=9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f
+
+ARG CURL_VERSION=curl-7.76.0
+ARG CURL_HASH=3b4378156ba09e224008e81dcce854b7ce4d182b1f9cfb97fe5ed9e9c18c6bd3
+
+ARG PERL_VERSION=perl-5.32.1
+ARG PERL_HASH=03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c
+
 # Image build scripts
 COPY \
   imagefiles/build-and-install-cmake.sh \
@@ -25,7 +37,7 @@ RUN \
   /buildscripts/build-and-install-openssh.sh && \
   /buildscripts/build-and-install-curl.sh && \
   /buildscripts/build-and-install-git.sh && \
-  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/build-and-install-cmake.sh $X86_FLAG && \
   /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} && \

imagefiles/build-and-install-curl.sh

@@ -10,8 +10,16 @@ source $MY_DIR/utils.sh
 # copied from https://github.com/pypa/manylinux/tree/master/docker/build_scripts
 #
 
-CURL_ROOT=curl-7.76.0
-CURL_HASH=3b4378156ba09e224008e81dcce854b7ce4d182b1f9cfb97fe5ed9e9c18c6bd3
+if [[ -z "${CURL_VERSION}" ]]; then
+  echo >&2 'error: CURL_VERSION env. variable must be set to a non-empty value'
+  exit 1
+fi
+
+if [[ -z "${CURL_HASH}" ]]; then
+  echo >&2 'error: CURL_HASH env. variable must be set to a non-empty value'
+  exit 1
+fi
+
 CURL_DOWNLOAD_URL=https://curl.haxx.se/download
 
 function do_curl_build {
@@ -43,7 +51,7 @@ function build_curl {
 }
 
 cd /usr/src
-build_curl $CURL_ROOT $CURL_HASH
+build_curl "${CURL_VERSION}" "${CURL_HASH}"
 
 (cat /etc/ld.so.conf.d/usr-local.conf 2> /dev/null | grep -q "^/usr/local/lib$") ||
   echo '/usr/local/lib' >> /etc/ld.so.conf.d/usr-local.conf

imagefiles/build-and-install-ninja.sh

@@ -25,14 +25,20 @@ while [ $# -gt 0 ]; do
   shift
 done
 
+if [[ -z "${NINJA_VERSION}" ]]; then
+  echo >&2 'error: NINJA_VERSION env. variable must be set to a non-empty value'
+  exit 1
+fi
+
 # Download
-REV=v1.10.2
+url="https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz"
+
 curl --connect-timeout 30 \
     --max-time 10 \
     --retry 5 \
     --retry-delay 10 \
     --retry-max-time 30 \
-    -# -o ninja.tar.gz -LO https://github.com/ninja-build/ninja/archive/$REV.tar.gz
+    -# -o ninja.tar.gz -LO "$url"
 
 mkdir ninja
 tar -xzvf ./ninja.tar.gz --strip-components=1 -C ./ninja

imagefiles/build-and-install-openssl.sh

@@ -47,14 +47,29 @@ source $MY_DIR/utils.sh
 # copied from https://github.com/pypa/manylinux/tree/master/docker/build_scripts
 #
 
-OPENSSL_ROOT=openssl-1.1.1l
+if [[ -z "${OPENSSL_VERSION}" ]]; then
+  echo >&2 'error: OPENSSL_VERSION env. variable must be set to a non-empty value'
+  exit 1
+fi
+
+if [[ -z "${OPENSSL_HASH}" ]]; then
+  echo >&2 'error: OPENSSL_HASH env. variable must be set to a non-empty value'
+  exit 1
+fi
+
+if [[ -z "${PERL_VERSION}" ]]; then
+  echo >&2 'error: PERL_VERSION env. variable must be set to a non-empty value'
+  exit 1
+fi
+
+if [[ -z "${PERL_HASH}" ]]; then
+  echo >&2 'error: PERL_HASH env. variable must be set to a non-empty value'
+  exit 1
+fi
+
 # Hash from https://www.openssl.org/source/openssl-1.1.1l.tar.gz.sha256
-OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
 OPENSSL_DOWNLOAD_URL=http://www.openssl.org/source/
 
-# a recent enough perl is needed to build openssl
-PERL_ROOT=perl-5.32.1
-PERL_HASH=03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c
 PERL_DOWNLOAD_URL=https://www.cpan.org/src/5.0
 
 function do_perl_build {
@@ -110,8 +125,8 @@ function build_openssl {
 }
 
 cd /usr/src
-build_perl $PERL_ROOT $PERL_HASH
-build_openssl $OPENSSL_ROOT $OPENSSL_HASH
+build_perl "${PERL_VERSION}" "${PERL_HASH}"
+build_openssl "${OPENSSL_VERSION}" "${OPENSSL_HASH}"
 
 # Delete PERL
 rm -rf /opt/perl