diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 0827a2b51c..66cb99c534 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -69,3 +69,6 @@ install-tarball: image: kata-tarball $(MK_DIR)kata-deploy-build-and-upload-image.sh $(CURDIR)/kata-static.tar.xz + +cc-rootfs-image-tarball: + ${MAKE} $@-build 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 2809d6e7d9..ae5d40d856 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -30,6 +30,8 @@ readonly virtiofsd_builder="${static_build_dir}/virtiofsd/build-static-virtiofsd readonly rootfs_builder="${repo_root_dir}/tools/packaging/guest-image/build_image.sh" +readonly cc_prefix="/opt/confidential-containers" + ARCH=$(uname -m) workdir="${WORKDIR:-$PWD}" @@ -83,6 +85,16 @@ EOF exit "${return_code}" } +#Install cc capable guest image +install_cc_image() { + info "Create CC image" + export SKOPEO=yes + export UMOCI=yes + export AA_KBC="offline_fs_kbc" + + "${rootfs_builder}" --imagetype=image --prefix="${cc_prefix}" --destdir="${destdir}" +} + #Install guest image install_image() { info "Create image" @@ -180,6 +192,8 @@ handle_build() { install_virtiofsd ;; + cc-rootfs-image) install_cc_image ;; + cloud-hypervisor) install_clh ;; firecracker) install_firecracker ;; @@ -227,6 +241,7 @@ main() { local build_targets local silent build_targets=( + cc-rootfs-image cloud-hypervisor firecracker kernel