github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-23 10:12:10 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: Support CCv0

Browse Source 
For the initrd build, add makeopts for $SKOPEO_UMOCI and $AA_KBC. Use
the $INCLUDE_ROOTFS variable to specify a directory of files that should
be recursively merged into the guest.

Fixes: #3126
Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
This commit is contained in:
Jakob Naucke 2021-11-25 16:49:35 +01:00 committed by Samuel Ortiz
parent 69d157f78b
commit f740f97bed
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/packaging/guest-image/build_image.sh
View File

@ -26,13 +26,17 @@ build_initrd() {
info "Build initrd" info "Build initrd"
info "initrd os: $initrd_distro" info "initrd os: $initrd_distro"
info "initrd os version: $initrd_os_version" info "initrd os version: $initrd_os_version"
sudo -E PATH="$PATH" make initrd \ local rootfs_build_dest="${builddir}/initrd-image"
DISTRO="$initrd_distro" \ export DISTRO="$initrd_distro"
DEBUG="${DEBUG:-}" \ export OS_VERSION="${initrd_os_version}"
OS_VERSION="${initrd_os_version}" \ export USE_DOCKER=1
ROOTFS_BUILD_DEST="${builddir}/initrd-image" \ export AGENT_INIT="yes"
USE_DOCKER=1 \ # ROOTFS_BUILD_DEST is a Make variable
AGENT_INIT="yes" sudo -E PATH="$PATH" make rootfs ROOTFS_BUILD_DEST="${rootfs_build_dest}"
if [ -n "${INCLUDE_ROOTFS:-}" ]; then
sudo cp -RL --preserve=mode "${INCLUDE_ROOTFS}/." "${rootfs_build_dest}/${initrd_distro}_rootfs/"
fi
sudo -E PATH="$PATH" make initrd ROOTFS_BUILD_DEST="${rootfs_build_dest}"
mv "kata-containers-initrd.img" "${install_dir}/${initrd_name}" mv "kata-containers-initrd.img" "${install_dir}/${initrd_name}"
( (
cd "${install_dir}" cd "${install_dir}"
@ -44,6 +48,9 @@ build_image() {
info "Build image" info "Build image"
info "image os: $img_distro" info "image os: $img_distro"
info "image os version: $img_os_version" info "image os version: $img_os_version"
# CCv0 on image is currently unsupported, do not pass
unset SKOPEO_UMOCI
unset AA_KBC
sudo -E PATH="${PATH}" make image \ sudo -E PATH="${PATH}" make image \
DISTRO="${img_distro}" \ DISTRO="${img_distro}" \
DEBUG="${DEBUG:-}" \ DEBUG="${DEBUG:-}" \

6
tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh
View File

@ -37,7 +37,11 @@ docker build -q -t build-kata-deploy \
docker run ${TTY_OPT} \ docker run ${TTY_OPT} \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
--user ${uid}:${gid} \ --user ${uid}:${gid} \
--env USER=${USER} -v "${kata_dir}:${kata_dir}" \ --env USER=${USER} \
--env SKOPEO_UMOCI="${SKOPEO_UMOCI:-}" \
--env AA_KBC="${AA_KBC:-}" \
--env INCLUDE_ROOTFS="${INCLUDE_ROOTFS:-}" \
-v "${kata_dir}:${kata_dir}" \
--rm \ --rm \
-w ${script_dir} \ -w ${script_dir} \
build-kata-deploy "${kata_deploy_create}" $@ build-kata-deploy "${kata_deploy_create}" $@