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

Merge pull request #10390 from microsoft/danmihai1/new-rootfs-image-mariner

Browse Source 
local-build: add ability to build rootfs-image-mariner
This commit is contained in:
Fabiano Fidêncio 2024-10-08 21:40:43 +02:00 committed by GitHub
commit 80196c06ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build-kata-static-tarball-amd64.yaml vendored
View File

@ -50,6 +50,7 @@ jobs:
- stratovirt - stratovirt
- rootfs-image - rootfs-image
- rootfs-image-confidential - rootfs-image-confidential
- rootfs-image-mariner
- rootfs-initrd - rootfs-initrd
- rootfs-initrd-confidential - rootfs-initrd-confidential
- rootfs-initrd-mariner - rootfs-initrd-mariner

4
tools/packaging/kata-deploy/local-build/Makefile
View File

@ -35,6 +35,7 @@ BASE_TARBALLS = serial-targets \
virtiofsd-tarball virtiofsd-tarball
BASE_SERIAL_TARBALLS = rootfs-image-tarball \ BASE_SERIAL_TARBALLS = rootfs-image-tarball \
rootfs-image-confidential-tarball \ rootfs-image-confidential-tarball \
rootfs-image-mariner-tarball \
rootfs-initrd-confidential-tarball \ rootfs-initrd-confidential-tarball \
rootfs-initrd-mariner-tarball \ rootfs-initrd-mariner-tarball \
rootfs-initrd-tarball \ rootfs-initrd-tarball \
@ -149,6 +150,9 @@ rootfs-image-tarball: agent-tarball
rootfs-image-confidential-tarball: agent-tarball pause-image-tarball coco-guest-components-tarball kernel-confidential-tarball rootfs-image-confidential-tarball: agent-tarball pause-image-tarball coco-guest-components-tarball kernel-confidential-tarball
${MAKE} $@-build ${MAKE} $@-build
rootfs-image-mariner-tarball: agent-tarball
${MAKE} $@-build
rootfs-initrd-mariner-tarball: agent-tarball rootfs-initrd-mariner-tarball: agent-tarball
${MAKE} $@-build ${MAKE} $@-build

8
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@ -118,6 +118,7 @@ options:
stratovirt stratovirt
rootfs-image rootfs-image
rootfs-image-confidential rootfs-image-confidential
rootfs-image-mariner
rootfs-initrd rootfs-initrd
rootfs-initrd-confidential rootfs-initrd-confidential
rootfs-initrd-mariner rootfs-initrd-mariner
@ -342,6 +343,11 @@ install_image_confidential() {
install_image "confidential" install_image "confidential"
} }
#Install cbl-mariner guest image
install_image_mariner() {
install_image "mariner"
}
#Install guest initrd #Install guest initrd
install_initrd() { install_initrd() {
local variant="${1:-}" local variant="${1:-}"
@ -1086,6 +1092,8 @@ handle_build() {
rootfs-image-confidential) install_image_confidential ;; rootfs-image-confidential) install_image_confidential ;;
rootfs-image-mariner) install_image_mariner ;;
rootfs-initrd) install_initrd ;; rootfs-initrd) install_initrd ;;
rootfs-initrd-confidential) install_initrd_confidential ;; rootfs-initrd-confidential) install_initrd_confidential ;;

3
versions.yaml
View File

@ -139,6 +139,9 @@ assets:
confidential: confidential:
name: *default-image-name name: *default-image-name
version: *default-image-version version: *default-image-version
mariner:
name: "cbl-mariner"
version: "2.0"
nvidia-gpu: nvidia-gpu:
name: *default-image-name name: *default-image-name
version: "jammy" version: "jammy"