vmm: Add mr_image in sys-config.json

Author: kvinwang

dstack-types/src/lib.rs

@@ -118,6 +118,8 @@ pub struct SysConfig {
     pub pccs_url: Option<String>,
     pub docker_registry: Option<String>,
     pub host_api_url: String,
+    #[serde(with = "hex_bytes", default)]
+    pub mr_image: Vec<u8>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]

vmm/src/app.rs

@@ -457,10 +457,22 @@ impl App {
         let manifest = work_dir.manifest().context("Failed to read manifest")?;
         let cfg = &self.config;
         let image_path = cfg.image_path.join(&manifest.image);
-        let image_info = ImageInfo::load(image_path.join("metadata.json"))
-            .context("Failed to load image info")?;
-        let img_ver = image_info.version_tuple().unwrap_or((0, 0, 0));
-        let sys_config = if img_ver >= (0, 4, 2) {
+        let image = Image::load(image_path).context("Failed to load image info")?;
+        let img_ver = image.info.version_tuple().unwrap_or((0, 0, 0));
+        let sys_config = if img_ver >= (5, 0, 0) {
+            serde_json::json!({
+                "kms_urls": cfg.cvm.kms_urls,
+                "gateway_urls": cfg.cvm.gateway_urls,
+                "pccs_url": cfg.cvm.pccs_url,
+                "docker_registry": cfg.cvm.docker_registry,
+                "host_api_url": format!("vsock://2:{}/api", cfg.host_api.port),
+                "vm_config": {
+                    "mr_image": &image.digest,
+                    "cpu_count": manifest.vcpu,
+                    "memory_size": manifest.memory * 1024 * 1024,
+                },
+            })
+        } else if img_ver >= (0, 4, 2) {
             serde_json::json!({
                 "kms_urls": cfg.cvm.kms_urls,
                 "gateway_urls": cfg.cvm.gateway_urls,
@@ -469,7 +481,8 @@ impl App {
                 "host_api_url": format!("vsock://2:{}/api", cfg.host_api.port),
             })
         } else if img_ver >= (0, 4, 0) {
-            let rootfs_hash = image_info
+            let rootfs_hash = image
+                .info
                 .rootfs_hash
                 .as_ref()
                 .context("Rootfs hash not found in image info")?;
@@ -482,7 +495,8 @@ impl App {
                 "host_api_url": format!("vsock://2:{}/api", cfg.host_api.port),
             })
         } else {
-            let rootfs_hash = image_info
+            let rootfs_hash = image
+                .info
                 .rootfs_hash
                 .as_ref()
                 .context("Rootfs hash not found in image info")?;

vmm/src/app/image.rs

@@ -56,6 +56,7 @@ pub struct Image {
     pub hda: Option<PathBuf>,
     pub rootfs: Option<PathBuf>,
     pub bios: Option<PathBuf>,
+    pub digest: Option<String>,
 }
 
 impl Image {
@@ -67,6 +68,7 @@ impl Image {
         let hda = info.hda.as_ref().map(|hda| base_path.join(hda));
         let rootfs = info.rootfs.as_ref().map(|rootfs| base_path.join(rootfs));
         let bios = info.bios.as_ref().map(|bios| base_path.join(bios));
+        let digest = fs::read_to_string(base_path.join("digest.txt")).ok().map(|s| s.trim().to_string());
         if info.version.is_empty() {
             // Older images does not have version field. Fallback to the version of the image folder name
             info.version = guess_version(&base_path).unwrap_or_default();
@@ -78,6 +80,7 @@ impl Image {
             kernel,
             rootfs,
             bios,
+            digest,
         }
         .ensure_exists()
     }