diff --git a/Cargo.lock b/Cargo.lock index 86b73cf..84abbb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1699,8 +1699,8 @@ dependencies = [ "env_logger", "hex", "log", - "oci-spec", "my-workspace-hack", + "oci-spec", "prost-types", "serde", "serde_json", diff --git a/crates/app/src/handlers.rs b/crates/app/src/handlers.rs index f1c7596..14b0631 100644 --- a/crates/app/src/handlers.rs +++ b/crates/app/src/handlers.rs @@ -1,5 +1,5 @@ use crate::types::*; -use actix_web::{web, HttpResponse, Responder}; +use actix_web::{HttpResponse, Responder, web}; use service::Service; use std::sync::Arc; @@ -36,4 +36,4 @@ pub async fn get_container_list( HttpResponse::Ok().json(container_list) } -// 添加更多的路由处理函数... \ No newline at end of file +// 添加更多的路由处理函数... diff --git a/crates/app/src/main.rs b/crates/app/src/main.rs index b1216ef..3669bcb 100644 --- a/crates/app/src/main.rs +++ b/crates/app/src/main.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use actix_web::{web, App, HttpServer}; +use actix_web::{App, HttpServer, web}; use service::Service; pub mod handlers; @@ -29,4 +29,4 @@ async fn main() -> std::io::Result<()> { .bind("0.0.0.0:18080")? .run() .await -} \ No newline at end of file +} diff --git a/crates/app/src/types.rs b/crates/app/src/types.rs index 0d92a7e..9b843e6 100644 --- a/crates/app/src/types.rs +++ b/crates/app/src/types.rs @@ -17,4 +17,4 @@ pub struct RemoveContainerInfo { pub struct GetContainerListQuery { pub status: Option, pub ns: String, -} \ No newline at end of file +} diff --git a/crates/service/src/lib.rs b/crates/service/src/lib.rs index dfb5304..71cf96a 100644 --- a/crates/service/src/lib.rs +++ b/crates/service/src/lib.rs @@ -1,16 +1,17 @@ pub mod spec; use containerd_client::{ + Client, services::v1::{ - container::Runtime, - snapshots::{MountsRequest, PrepareSnapshotRequest}, Container, CreateContainerRequest, CreateTaskRequest, DeleteContainerRequest, DeleteTaskRequest, GetImageRequest, KillRequest, ListContainersRequest, ListTasksRequest, ReadContentRequest, StartRequest, WaitRequest, + container::Runtime, + snapshots::{MountsRequest, PrepareSnapshotRequest}, }, tonic::Request, types::Mount, - with_namespace, Client, + with_namespace, }; use oci_spec::image::{Arch, ImageConfiguration, ImageIndex, ImageManifest, MediaType, Os}; use prost_types::Any; @@ -63,12 +64,7 @@ impl Service { Ok(resp) } - pub async fn create_container( - &self, - image_name: &str, - cid: &str, - ns: &str, - ) -> Result<(), Err> { + pub async fn create_container(&self, image_name: &str, cid: &str, ns: &str) -> Result<(), Err> { let namespace = match ns { "" => spec::DEFAULT_NAMESPACE, _ => ns, @@ -524,4 +520,4 @@ impl Service { } } //容器是容器,要先启动,然后才能运行任务 -//要想删除一个正在运行的Task,必须先kill掉这个task,然后才能删除。 \ No newline at end of file +//要想删除一个正在运行的Task,必须先kill掉这个task,然后才能删除。 diff --git a/crates/service/src/spec.rs b/crates/service/src/spec.rs index 65394eb..6469009 100644 --- a/crates/service/src/spec.rs +++ b/crates/service/src/spec.rs @@ -315,4 +315,4 @@ pub fn generate_spec(id: &str, ns: &str) -> Result { let path = format!("{}/{}/{}.json", PATH_TO_SPEC_PREFIX, namespace, id); save_spec_to_file(&spec, &path)?; Ok(path) -} \ No newline at end of file +}