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

Merge pull request #9480 from zvonkok/build-image-suffix

Browse Source 
image: Add suffix to image or initrd depending on the NVIDIA driver version
This commit is contained in:
Zvonko Kaiser 2024-11-05 09:43:56 -05:00 committed by GitHub
commit a4725034b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ build_initrd() {
info "initrd os: $os_name" info "initrd os: $os_name"
info "initrd os version: $os_version" info "initrd os version: $os_version"
make initrd \ make initrd \
VARIANT="${image_initrd_suffix}" \
DISTRO="$os_name" \ DISTRO="$os_name" \
DEBUG="${DEBUG:-}" \ DEBUG="${DEBUG:-}" \
OS_VERSION="${os_version}" \ OS_VERSION="${os_version}" \
@ -48,7 +49,13 @@ build_initrd() {
PULL_TYPE="${PULL_TYPE:-default}" \ PULL_TYPE="${PULL_TYPE:-default}" \
COCO_GUEST_COMPONENTS_TARBALL="${COCO_GUEST_COMPONENTS_TARBALL:-}" \ COCO_GUEST_COMPONENTS_TARBALL="${COCO_GUEST_COMPONENTS_TARBALL:-}" \
PAUSE_IMAGE_TARBALL="${PAUSE_IMAGE_TARBALL:-}" PAUSE_IMAGE_TARBALL="${PAUSE_IMAGE_TARBALL:-}"
mv "kata-containers-initrd.img" "${install_dir}/${artifact_name}"
if [[ "${image_initrd_suffix}" == "nvidia-gpu"* ]]; then
nvidia_driver_version=$(cat "${builddir}"/initrd-image/*/nvidia_driver_version)
artifact_name=${artifact_name/.initrd/"-${nvidia_driver_version}".initrd}
fi
mv -f "kata-containers-initrd.img" "${install_dir}/${artifact_name}"
( (
cd "${install_dir}" cd "${install_dir}"
ln -sf "${artifact_name}" "${final_artifact_name}${image_initrd_extension}" ln -sf "${artifact_name}" "${final_artifact_name}${image_initrd_extension}"
@ -60,6 +67,7 @@ build_image() {
info "image os: $os_name" info "image os: $os_name"
info "image os version: $os_version" info "image os version: $os_version"
make image \ make image \
VARIANT="${image_initrd_suffix}" \
DISTRO="${os_name}" \ DISTRO="${os_name}" \
DEBUG="${DEBUG:-}" \ DEBUG="${DEBUG:-}" \
USE_DOCKER="1" \ USE_DOCKER="1" \
@ -70,6 +78,12 @@ build_image() {
PULL_TYPE="${PULL_TYPE:-default}" \ PULL_TYPE="${PULL_TYPE:-default}" \
COCO_GUEST_COMPONENTS_TARBALL="${COCO_GUEST_COMPONENTS_TARBALL:-}" \ COCO_GUEST_COMPONENTS_TARBALL="${COCO_GUEST_COMPONENTS_TARBALL:-}" \
PAUSE_IMAGE_TARBALL="${PAUSE_IMAGE_TARBALL:-}" PAUSE_IMAGE_TARBALL="${PAUSE_IMAGE_TARBALL:-}"
if [[ "${image_initrd_suffix}" == "nvidia-gpu"* ]]; then
nvidia_driver_version=$(cat "${builddir}"/rootfs-image/*/nvidia_driver_version)
artifact_name=${artifact_name/.image/"-${nvidia_driver_version}".image}
fi
mv -f "kata-containers.img" "${install_dir}/${artifact_name}" mv -f "kata-containers.img" "${install_dir}/${artifact_name}"
if [ -e "root_hash.txt" ]; then if [ -e "root_hash.txt" ]; then
cp root_hash.txt "${install_dir}/" cp root_hash.txt "${install_dir}/"