build: Pass RUSTUP_UPDATE_ROOT & RUSTUP_DIST_SERVER down

This may help us to decrease the amount of issues we're having with the
TDX CI.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>

tools/osbuilder/scripts/lib.sh

@@ -236,6 +236,9 @@ generate_dockerfile()
 	readonly install_rust="
 ENV http_proxy=${http_proxy:-}
 ENV https_proxy=${http_proxy:-}
+ENV RUSTUP_UPDATE_ROOT="${RUSTUP_UPDATE_ROOT:-}"
+ENV RUSTUP_DIST_SERVER="${RUSTUP_DIST_SERVER:-}"
+
 RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSLf | \
     sh -s -- -y --default-toolchain ${RUST_VERSION} -t ${rustarch}-unknown-linux-${LIBC}
 RUN . /root/.cargo/env; cargo install cargo-when

tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh

@@ -18,6 +18,8 @@ uid=$(id -u ${USER})
 gid=$(id -g ${USER})
 http_proxy="${http_proxy:-}"
 https_proxy="${https_proxy:-}"
+RUSTUP_UPDATE_ROOT="${RUSTUP_UPDATE_ROOT:-}"
+RUSTUP_DIST_SERVER="${RUSTUP_DIST_SERVER:-}"
 
 ARCH=${ARCH:-$(uname -m)}
 CROSS_BUILD=
@@ -99,6 +101,8 @@ docker run \
 	--env CROSS_BUILD="${CROSS_BUILD}" \
 	--env TARGET_ARCH="${TARGET_ARCH}" \
 	--env ARCH="${ARCH}" \
+	--env RUSTUP_UPDATE_ROOT="${RUSTUP_UPDATE_ROOT}" \
+	--env RUSTUP_DIST_SERVER="${RUSTUP_DIST_SERVER}" \
 	--rm \
 	-w ${script_dir} \
 	build-kata-deploy "${kata_deploy_create}" $@

tools/packaging/static-build/shim-v2/build.sh

@@ -20,6 +20,8 @@ VMM_CONFIGS="qemu fc"
 GO_VERSION=${GO_VERSION}
 RUST_VERSION=${RUST_VERSION}
 CC=""
+RUSTUP_UPDATE_ROOT="${RUSTUP_UPDATE_ROOT:-}"
+RUSTUP_DIST_SERVER="${RUSTUP_DIST_SERVER:-}"
 
 DESTDIR=${DESTDIR:-${PWD}}
 PREFIX=${PREFIX:-/opt/kata}
@@ -53,6 +55,8 @@ sudo docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \
 	--env CROSS_BUILD=${CROSS_BUILD} \
 	--env ARCH=${ARCH} \
 	--env CC="${CC}" \
+        --env RUSTUP_UPDATE_ROOT="${RUSTUP_UPDATE_ROOT}" \
+        --env RUSTUP_DIST_SERVER="${RUSTUP_DIST_SERVER}" \
 	-w "${repo_root_dir}/src/runtime-rs" \
 	"${container_image}" \
 	bash -c "git config --global --add safe.directory ${repo_root_dir} && make PREFIX=${PREFIX} QEMUCMD=qemu-system-${arch}"
@@ -61,6 +65,8 @@ sudo docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \
 	--env CROSS_BUILD=${CROSS_BUILD} \
         --env ARCH=${ARCH} \
         --env CC="${CC}" \
+        --env RUSTUP_UPDATE_ROOT="${RUSTUP_UPDATE_ROOT}" \
+        --env RUSTUP_DIST_SERVER="${RUSTUP_DIST_SERVER}" \
 	-w "${repo_root_dir}/src/runtime-rs" \
 	"${container_image}" \
 	bash -c "git config --global --add safe.directory ${repo_root_dir} && make PREFIX="${PREFIX}" DESTDIR="${DESTDIR}" install"

tools/packaging/static-build/shim-v2/install_go_rust.sh

@@ -9,6 +9,9 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+RUSTUP_UPDATE_ROOT="${RUSTUP_UPDATE_ROOT:-}"
+RUSTUP_DIST_SERVER="${RUSTUP_DIST_SERVER:-}"
+
 tmp_dir=$(mktemp -d -t install-go-tmp.XXXXXXXXXX)
 script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 script_name="$(basename "${BASH_SOURCE[0]}")"
@@ -82,6 +85,14 @@ case "${ARCH}" in
 		;;
 esac
 
+if [ -n "${RUSTUP_UPDATE_ROOT}" ]; then
+	export RUSTUP_UPDATE_ROOT=${RUSTUP_UPDATE_ROOT}
+fi
+
+if [ -n "${RUSTUP_DIST_SERVER}" ]; then
+	export RUSTUP_DIST_SERVER=${RUSTUP_DIST_SERVER}
+fi
+
 curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSLf | sh -s -- -y --default-toolchain ${rust_version} -t ${ARCH}-unknown-linux-${LIBC}
 source /root/.cargo/env
 rustup target add ${ARCH}-unknown-linux-${LIBC}