diff --git a/utils/docker/Dockerfile.el.8 b/utils/docker/Dockerfile.el.8 index 4af7c0fc997..b67d7a94a1b 100644 --- a/utils/docker/Dockerfile.el.8 +++ b/utils/docker/Dockerfile.el.8 @@ -1,5 +1,5 @@ # Copyright 2018-2024 Intel Corporation -# Copyright 2025 Hewlett Packard Enterprise Development LP +# Copyright 2025-2026 Hewlett Packard Enterprise Development LP # All rights reserved. # # 'recipe' for Docker to build an image of EL 8 based @@ -17,6 +17,17 @@ ARG BASE_DISTRO # Intermittent cache-bust. Used to reduce load on the actual CB1 later. ARG CB0 +# Accept DAOS_NO_PROXY at build time +ARG DAOS_NO_PROXY +# Propagate into the build environment +ENV no_proxy=${DAOS_NO_PROXY} +ENV NO_PROXY=${DAOS_NO_PROXY} +# Persist into /etc/environment for use by shells and services +RUN cat <> /etc/environment +"no_proxy=${DAOS_NO_PROXY}" +"NO_PROXY=${DAOS_NO_PROXY}" +EOF + ARG REPO_FILE_URL ARG JENKINS_URL ARG REPOS diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index e78bd286943..49eecb8b4c9 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -1,5 +1,5 @@ # Copyright 2022-2024 Intel Corporation -# Copyright 2025 Hewlett Packard Enterprise Development LP +# Copyright 2025-2026 Hewlett Packard Enterprise Development LP # All rights reserved. # # 'recipe' for Docker to build an image of EL 9 based @@ -17,6 +17,17 @@ ARG BASE_DISTRO # Intermittent cache-bust. Used to reduce load on the actual CB1 later. ARG CB0 +# Accept DAOS_NO_PROXY at build time +ARG DAOS_NO_PROXY +# Propagate into the build environment +ENV no_proxy=${DAOS_NO_PROXY} +ENV NO_PROXY=${DAOS_NO_PROXY} +# Persist into /etc/environment for use by shells and services +RUN cat <> /etc/environment +"no_proxy=${DAOS_NO_PROXY}" +"NO_PROXY=${DAOS_NO_PROXY}" +EOF + ARG REPO_FILE_URL ARG JENKINS_URL ARG REPOS diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index 64449aa3efd..5bc352bfd94 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -18,6 +18,17 @@ ARG BASE_DISTRO # Intermittent cache-bust. Used to reduce load on the actual CB1 later. ARG CB0 +# Accept DAOS_NO_PROXY at build time +ARG DAOS_NO_PROXY +# Propagate into the build environment +ENV no_proxy=${DAOS_NO_PROXY} +ENV NO_PROXY=${DAOS_NO_PROXY} +# Persist into /etc/environment for use by shells and services +RUN cat <> /etc/environment +"no_proxy=${DAOS_NO_PROXY}" +"NO_PROXY=${DAOS_NO_PROXY}" +EOF + ARG REPO_FILE_URL ARG JENKINS_URL ARG REPOS diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh index 88bcf6654aa..c935e867abb 100755 --- a/utils/scripts/helpers/repo-helper-el8.sh +++ b/utils/scripts/helpers/repo-helper-el8.sh @@ -130,10 +130,12 @@ disable_repos /etc/yum.repos.d/ "${save_repos[@]}" if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}" trusted_host="${trusted_host%%/*}"; \ - { - echo "[global]" - echo "trusted-host = ${trusted_host}" - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - echo "proxy = \"\"" - } > /etc/pip.conf + cat < /etc/pip.conf +[global] + trusted-host = ${trusted_host} + index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple + progress_bar = off + no_color = true + quiet = 1 +EOF fi diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh index f96a144b674..ece81cf786f 100644 --- a/utils/scripts/helpers/repo-helper-el9.sh +++ b/utils/scripts/helpers/repo-helper-el9.sh @@ -126,10 +126,12 @@ disable_repos /etc/yum.repos.d/ "${save_repos[@]}" if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}" trusted_host="${trusted_host%%/*}"; \ - { - echo "[global]" - echo "trusted-host = ${trusted_host}" - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - echo "proxy = " - } > /etc/pip.conf + cat < /etc/pip.conf +[global] + trusted-host = ${trusted_host} + index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple + progress_bar = off + no_color = true + quiet = 1 +EOF fi diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh index 86251a6d7e2..2f5046332b6 100755 --- a/utils/scripts/helpers/repo-helper-leap15.sh +++ b/utils/scripts/helpers/repo-helper-leap15.sh @@ -172,10 +172,12 @@ update-ca-certificates if [ -n "$REPO_FILE_URL" ]; then trusted_host="${REPO_FILE_URL##*//}" trusted_host="${trusted_host%%/*}"; \ - { - echo "[global]" - echo "trusted-host = ${trusted_host}" - echo "index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple" - echo "proxy = \"\"" - } > /etc/pip.conf + cat < /etc/pip.conf +[global] + trusted-host = ${trusted_host} + index-url = https://${trusted_host}/artifactory/api/pypi/pypi-proxy/simple + progress_bar = off + no_color = true + quiet = 1 +EOF fi