github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-22 17:59:31 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: Support separate Skopeo spec

Browse Source 
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 <jakob.naucke@ibm.com>
This commit is contained in:
Jakob Naucke 2021-12-03 15:28:47 +01:00 committed by stevenhorsman
parent af91084887
commit 389bbcb183
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,8 @@ 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 # CCv0 on image is currently unsupported, do not pass
unset SKOPEO_UMOCI unset SKOPEO
unset UMOCI
unset AA_KBC unset AA_KBC
sudo -E PATH="${PATH}" make image \ sudo -E PATH="${PATH}" make image \
DISTRO="${img_distro}" \ DISTRO="${img_distro}" \

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

@ -38,7 +38,8 @@ 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} \ --env USER=${USER} \
--env SKOPEO_UMOCI="${SKOPEO_UMOCI:-}" \ --env SKOPEO="${SKOPEO:-}" \
--env UMOCI="${UMOCI:-}" \
--env AA_KBC="${AA_KBC:-}" \ --env AA_KBC="${AA_KBC:-}" \
--env INCLUDE_ROOTFS="${INCLUDE_ROOTFS:-}" \ --env INCLUDE_ROOTFS="${INCLUDE_ROOTFS:-}" \
-v "${kata_dir}:${kata_dir}" \ -v "${kata_dir}:${kata_dir}" \