diff --git a/blobs/aarch64/linuxkit b/blobs/aarch64/linuxkit index bed745d5..35644099 100755 Binary files a/blobs/aarch64/linuxkit and b/blobs/aarch64/linuxkit differ diff --git a/blobs/x86_64/linuxkit b/blobs/x86_64/linuxkit index 8da87f43..dc0dab7e 100755 Binary files a/blobs/x86_64/linuxkit and b/blobs/x86_64/linuxkit differ diff --git a/enclave_build/src/lib.rs b/enclave_build/src/lib.rs index 66069b48..f61b3e6b 100644 --- a/enclave_build/src/lib.rs +++ b/enclave_build/src/lib.rs @@ -225,10 +225,11 @@ impl<'a> Docker2Eif<'a> { let output = Command::new(&self.linuxkit_path) .args([ "build", - "-name", + "--name", &bootstrap_ramfs, - "-format", - "kernel+initrd", + "--format", + "kernel+initrd-nogz", + "--no-sbom", ramfs_config_file.path().to_str().unwrap(), ]) .output() @@ -245,13 +246,12 @@ impl<'a> Docker2Eif<'a> { let output = Command::new(&self.linuxkit_path) .args([ "build", - "-docker", - "-name", + "--docker", + "--name", &customer_ramfs, - "-format", - "kernel+initrd", - "-prefix", - "rootfs/", + "--format", + "kernel+initrd-nogz", + "--no-sbom", ramfs_with_rootfs_config_file.path().to_str().unwrap(), ]) .output() diff --git a/enclave_build/src/yaml_generator.rs b/enclave_build/src/yaml_generator.rs index cf54b355..af238c88 100644 --- a/enclave_build/src/yaml_generator.rs +++ b/enclave_build/src/yaml_generator.rs @@ -12,6 +12,7 @@ struct BootstrapRamfsTemplate { #[derive(Debug, Serialize, Deserialize)] struct CustomerRamfsTemplate { + prefix: String, init: Vec, files: ( DirTemplate, @@ -102,6 +103,7 @@ impl YamlGenerator { pub fn get_customer_ramfs(&self) -> Result { let ramfs = CustomerRamfsTemplate { + prefix: "rootfs/".to_string(), init: vec![self.docker_image.clone()], // Each directory must stay under rootfs, as expected by init files: ( @@ -204,6 +206,7 @@ mod tests { assert_eq!( customer_data, "---\ + \nprefix: rootfs/\ \ninit:\ \n - docker_image\ \nfiles:\