From 98b5a19b3a3ecce35b4a9cdd7a5eb9a842a2cd16 Mon Sep 17 00:00:00 2001 From: Gabriela Cervantes Date: Wed, 24 Jan 2024 17:05:17 +0000 Subject: [PATCH] tools: Use defined variable in build base qemu script This PR uses a variable that is already defined in the build base qemu script to have uniformity across the script as this variable is already used in the script. Fixes #8903 Signed-off-by: Gabriela Cervantes --- tools/packaging/static-build/qemu/build-base-qemu.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/packaging/static-build/qemu/build-base-qemu.sh b/tools/packaging/static-build/qemu/build-base-qemu.sh index 1514419d78..c404ca56ff 100755 --- a/tools/packaging/static-build/qemu/build-base-qemu.sh +++ b/tools/packaging/static-build/qemu/build-base-qemu.sh @@ -47,7 +47,7 @@ CACHE_TIMEOUT=$(date +"%Y-%m-%d") container_image="${QEMU_CONTAINER_BUILDER:-$(get_qemu_image_name)}" [ "${CROSS_BUILD}" == "true" ] && container_image="${container_image}-cross-build" -sudo docker pull ${container_image} || (sudo "${container_engine}" build \ +sudo ${container_engine} pull ${container_image} || (sudo "${container_engine}" build \ --build-arg CACHE_TIMEOUT="${CACHE_TIMEOUT}" \ --build-arg http_proxy="${http_proxy}" \ --build-arg https_proxy="${https_proxy}" \ @@ -56,8 +56,8 @@ sudo docker pull ${container_image} || (sudo "${container_engine}" build \ "${packaging_dir}" \ -f "${script_dir}/Dockerfile" \ -t "${container_image}" && \ - # No-op unless PUSH_TO_REGISTRY is exported as "yes" - push_to_registry "${container_image}") + # No-op unless PUSH_TO_REGISTRY is exported as "yes" + push_to_registry "${container_image}") sudo "${container_engine}" run \ --rm \