From 6f92688a3c58187bc5ef3385f6c5df5195151d38 Mon Sep 17 00:00:00 2001 From: Noor Date: Thu, 6 Mar 2025 01:09:17 +0000 Subject: [PATCH] Add hratls_pubkey parameter to deploy_enclave function and update related calls --- Cargo.lock | 2 +- src/container.rs | 6 ++++-- src/data.rs | 7 ++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38a28bd..b07c7c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "detee-shared" version = "0.1.0" -source = "git+ssh://git@gitea.detee.cloud/noormohammedb/detee-shared?branch=stable_01#a6baa4059d2836b88d52cd56216993e92e83ecbc" +source = "git+ssh://git@gitea.detee.cloud/noormohammedb/detee-shared?branch=stable_01#9ba3bc318617b08d8c761767a23abd77519b7e6d" dependencies = [ "base64", "prost", diff --git a/src/container.rs b/src/container.rs index 2e16b6d..ea05c92 100644 --- a/src/container.rs +++ b/src/container.rs @@ -6,6 +6,7 @@ pub fn deploy_enclave( enclave_path: &str, container_name_uuid: String, port_map: Vec<(u16, u16)>, + hratls_pubkey: String, ) -> Result { let port_maping_string = port_map .iter() @@ -15,8 +16,9 @@ pub fn deploy_enclave( info!("Deploying enclave: {:?}", enclave_path); let docker_deploy_str = format!( - r#"docker run -d --name {container_name_uuid} -v {enclave_path}:/enclave_packager \ - --device /dev/sgx/enclave --device /dev/sgx/provision {port_maping_string} noormohammedb/occlum-enclave:v1"# + r#"docker run -d --name {container_name_uuid} -v {enclave_path}:/enclave_package \ + --device /dev/sgx/enclave --device /dev/sgx/provision \ + {port_maping_string} noormohammedb/occlum-enclave:v1 {hratls_pubkey}"# ); let mut child = Command::new("sh") diff --git a/src/data.rs b/src/data.rs index 8acfe4e..b33ceb8 100644 --- a/src/data.rs +++ b/src/data.rs @@ -122,7 +122,12 @@ impl App { let package_path = handle_package(package_url, app_uuid.clone(), host_config.delete_archive).await?; - let exit_code = deploy_enclave(&package_path, app_name.clone(), mapped_ports.clone())?; + let exit_code = deploy_enclave( + &package_path, + app_name.clone(), + mapped_ports.clone(), + new_app_req.hratls_pubkey, + )?; if exit_code != 0 { // TODO: cleanup unarchive_dir