From 389bbcb183a7d090db9e95d25b340d5e2163fffe Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Fri, 3 Dec 2021 15:28:47 +0100 Subject: [PATCH] kata-deploy: Support separate Skopeo spec The initrd build process now supports facultatively installing Skopeo while still installing Umoci. Mirror this change in the respective kata-deploy process. Signed-off-by: Jakob Naucke --- tools/packaging/guest-image/build_image.sh | 3 ++- .../kata-deploy/local-build/kata-deploy-binaries-in-docker.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/packaging/guest-image/build_image.sh b/tools/packaging/guest-image/build_image.sh index 27ec99e0b7..65c0ba8e0d 100755 --- a/tools/packaging/guest-image/build_image.sh +++ b/tools/packaging/guest-image/build_image.sh @@ -49,7 +49,8 @@ build_image() { info "image os: $img_distro" info "image os version: $img_os_version" # CCv0 on image is currently unsupported, do not pass - unset SKOPEO_UMOCI + unset SKOPEO + unset UMOCI unset AA_KBC sudo -E PATH="${PATH}" make image \ DISTRO="${img_distro}" \ 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 c026d4c199..a8f7b118e7 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 @@ -38,7 +38,8 @@ docker run ${TTY_OPT} \ -v /var/run/docker.sock:/var/run/docker.sock \ --user ${uid}:${gid} \ --env USER=${USER} \ - --env SKOPEO_UMOCI="${SKOPEO_UMOCI:-}" \ + --env SKOPEO="${SKOPEO:-}" \ + --env UMOCI="${UMOCI:-}" \ --env AA_KBC="${AA_KBC:-}" \ --env INCLUDE_ROOTFS="${INCLUDE_ROOTFS:-}" \ -v "${kata_dir}:${kata_dir}" \