diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 44e89745fdc..f50c131a764 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -31,6 +31,7 @@ ARG REPO_FILE_URL ARG JENKINS_URL ARG REPOS ARG DAOS_LAB_CA_FILE_URL +ARG ZSCALER_CA_FILE # Accept DAOS_HTTP_PROXY, DAOS_HTTPS_PROXY, and DAOS_NO_PROXY at build time ARG DAOS_HTTP_PROXY diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index 621faa8f2d0..419a78d32e9 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -31,6 +31,7 @@ ARG REPO_FILE_URL ARG JENKINS_URL ARG REPOS ARG DAOS_LAB_CA_FILE_URL +ARG ZSCALER_CA_FILE # Accept DAOS_HTTP_PROXY, DAOS_HTTPS_PROXY, and DAOS_NO_PROXY at build time ARG DAOS_HTTP_PROXY @@ -242,6 +243,9 @@ RUN --mount=type=bind,source=VERSION,target=/home/daos/daos/VERSION \ --mount=type=bind,source=src,target=/tmp/daos-src \ [ "$DAOS_BUILD" != "yes" ] || { \ export GOCACHE=/tmp/go-cache && \ + source /etc/profile.d/lmod.sh && \ + export MODULEPATH=/usr/share/modules:$MODULEPATH && \ + module load gnu-openmpi && \ mkdir -p /home/daos/daos/src && \ cp -r /tmp/daos-src/. /home/daos/daos/src && \ scons --jobs $JOBS install PREFIX=/opt/daos COMPILER=$COMPILER \ diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu index 3a881f40783..c607f71aa3c 100644 --- a/utils/docker/Dockerfile.ubuntu +++ b/utils/docker/Dockerfile.ubuntu @@ -22,6 +22,7 @@ ENV DEBIAN_FRONTEND=noninteractive # Install basic tools ARG DAOS_LAB_CA_FILE_URL +ARG ZSCALER_CA_FILE # Accept DAOS_NO_PROXY at build time ARG DAOS_NO_PROXY diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index b826f933aa9..2860e589177 100755 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -17,6 +17,7 @@ set -uex : "${JENKINS_URL:=}" : "${REPOS:=}" : "${DAOS_LAB_CA_FILE_URL:=}" +: "${ZSCALER_CA_FILE:=}" : "${REPOSITORY_NAME:=artifactory}" # shellcheck disable=SC2120 @@ -56,6 +57,17 @@ install_optional_ca() { fi } +install_zscaler_ca() { + ca_storage="/etc/pki/ca-trust/source/anchors/" + if [ -n "$ZSCALER_CA_FILE" ]; then + echo "$ZSCALER_CA_FILE" >> "${ca_storage}ZscalerRootCertificate-2048-SHA256.crt" + update-ca-trust + fi +} + +# Install Zscaler CA if provided +install_zscaler_ca + # installs/upgrades of epel-release add repos # Disable mirrorlist check when using local repos. DISTRO="rocky" diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index 60e9ee9dda9..e06b9d71546 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -17,6 +17,7 @@ set -uex : "${JENKINS_URL:=}" : "${REPOS:=}" : "${DAOS_LAB_CA_FILE_URL:=}" +: "${ZSCALER_CA_FILE:=}" : "${REPOSITORY_NAME:=artifactory}" # shellcheck disable=SC2120 @@ -82,6 +83,17 @@ install_optional_ca() { fi } +install_zscaler_ca() { + ca_storage="/etc/pki/trust/anchors/" + if [ -n "$ZSCALER_CA_FILE" ]; then + echo "$ZSCALER_CA_FILE" >> "${ca_storage}ZscalerRootCertificate-2048-SHA256.crt" + update-ca-certificates + fi +} + +# Install Zscaler CA if provided +install_zscaler_ca + # Use local repo server if present # if a local repo server is present and the distro repo server can not # be reached, have to bootstrap in an environment to get curl installed diff --git a/utils/scripts/helpers/repo-helper-ubuntu.sh b/utils/scripts/helpers/repo-helper-ubuntu.sh index 262616a5241..93a23709103 100644 --- a/utils/scripts/helpers/repo-helper-ubuntu.sh +++ b/utils/scripts/helpers/repo-helper-ubuntu.sh @@ -13,7 +13,8 @@ set -uex : "${REPO_FILE_URL:=}" : "${HTTPS_PROXY:=}" -: "${DAOS_LAB_CA_FILE_UR:=}" +: "${DAOS_LAB_CA_FILE_URL:=}" +: "${ZSCALER_CA_FILE:=}" : "${REPOSITORY_NAME:=artifactory}" : "${BASE_DISTRO:=24.04}" @@ -58,6 +59,14 @@ install_optional_ca() { fi } +install_zscaler_ca() { + ca_storage="/etc/pki/ca-trust/source/anchors/" + if [ -n "$ZSCALER_CA_FILE" ]; then + echo "$ZSCALER_CA_FILE" >> "${ca_storage}ZscalerRootCertificate-2048-SHA256.crt" + update-ca-trust + fi +} + echo "APT::Get::Assume-Yes \"true\";" > /etc/apt/apt.conf.d/no-prompt echo "APT::Install-Recommends \"false\";" > /etc/apt/apt.conf.d/no-recommends if [ -n "$HTTPS_PROXY" ];then @@ -72,6 +81,9 @@ if [ -n "$HTTPS_PROXY" ];then fi fi +# Install Zscaler CA if provided +install_zscaler_ca + # These need to be installed here until we can figure out how to # get them installed from a local repository. apt-get update diff --git a/utils/scripts/install-leap15.sh b/utils/scripts/install-leap15.sh index dcd17af6e50..872868aca3e 100755 --- a/utils/scripts/install-leap15.sh +++ b/utils/scripts/install-leap15.sh @@ -67,6 +67,7 @@ dnf --nodocs install ${dnf_install_args} \ patch \ patchelf \ pciutils-devel \ + procps \ python${PYTHON_VERSION//./}-devel \ rpm-build \ scons \