From 80a831e537bdf247833f5e90e425b068b9578085 Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Fri, 19 Aug 2022 18:22:10 -0300 Subject: [PATCH] kata-deploy: allow to build the image without skopeo The local-build script should honor the value of SKOPEO exported in the environment so that it will be able to build the image without skopeo inside. This remove the hard-coded "SKOPEO=yes". Fixes #4959 Signed-off-by: Wainer dos Santos Moschetta --- .../packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 5aa8bd336c..999f545a69 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -112,11 +112,11 @@ install_cc_clh() { #Install cc capable guest image install_cc_image() { - info "Create CC image" - export SKOPEO=yes + export SKOPEO="${SKOPEO:-yes}" export UMOCI=yes export AA_KBC="offline_fs_kbc" + info "Create CC image configured with SKOPEO=${SKOPEO} UMOCI=${UMOCI} AA_KBC=${AA_KBC}" "${rootfs_builder}" --imagetype=image --prefix="${cc_prefix}" --destdir="${destdir}" }