From 95da1c71ecea55e5f82b4c872ee4da0b36daa4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 3 Oct 2023 14:25:24 +0200 Subject: [PATCH] packaging: tools: Fix container image env var name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should be TOOLS_CONTAINER_BUILDER instead of VIRTIOFSD_CONTAINER_BUILDER. Signed-off-by: Fabiano Fidêncio (cherry picked from commit ca3b8883716aef524df61a018bbf5e1564ee22d5) --- .../kata-deploy/local-build/kata-deploy-binaries-in-docker.sh | 1 + tools/packaging/static-build/tools/build.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh index 080aa1a12..19653720e 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh @@ -91,6 +91,7 @@ OVMF_CONTAINER_BUILDER="${OVMF_CONTAINER_BUILDER:-}" QEMU_CONTAINER_BUILDER="${QEMU_CONTAINER_BUILDER:-}" SHIM_V2_CONTAINER_BUILDER="${SHIM_V2_CONTAINER_BUILDER:-}" TDSHIM_CONTAINER_BUILDER="${TDSHIM_CONTAINER_BUILDER:-}" +TOOLS_CONTAINER_BUILDER="${TOOLS_CONTAINER_BUILDER:-}" VIRTIOFSD_CONTAINER_BUILDER="${VIRTIOFSD_CONTAINER_BUILDER:-}" MEASURED_ROOTFS="${MEASURED_ROOTFS:-}" USE_CACHE="${USE_CACHE:-}" diff --git a/tools/packaging/static-build/tools/build.sh b/tools/packaging/static-build/tools/build.sh index 11abe7bb2..a4dd958c4 100755 --- a/tools/packaging/static-build/tools/build.sh +++ b/tools/packaging/static-build/tools/build.sh @@ -15,7 +15,7 @@ source "${script_dir}/../../scripts/lib.sh" tool="${1}" -container_image="${VIRTIOFSD_CONTAINER_BUILDER:-$(get_tools_image_name)}" +container_image="${TOOLS_CONTAINER_BUILDER:-$(get_tools_image_name)}" [ "${CROSS_BUILD}" == "true" ] && container_image="${container_image}-cross-build" sudo docker pull ${container_image} || \