diff --git a/crates/app/src/handlers.rs b/crates/app/src/handlers.rs index 14b0631..f1c7596 100644 --- a/crates/app/src/handlers.rs +++ b/crates/app/src/handlers.rs @@ -1,5 +1,5 @@ use crate::types::*; -use actix_web::{HttpResponse, Responder, web}; +use actix_web::{web, HttpResponse, Responder}; 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 3669bcb..b1216ef 100644 --- a/crates/app/src/main.rs +++ b/crates/app/src/main.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use actix_web::{App, HttpServer, web}; +use actix_web::{web, App, HttpServer}; 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 9b843e6..0d92a7e 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 71f7b8f..dfb5304 100644 --- a/crates/service/src/lib.rs +++ b/crates/service/src/lib.rs @@ -1,7 +1,6 @@ pub mod spec; use containerd_client::{ - Client, services::v1::{ container::Runtime, snapshots::{MountsRequest, PrepareSnapshotRequest}, @@ -19,16 +18,6 @@ use sha2::{Digest, Sha256}; use spec::generate_spec; use std::{ fs, - Container, CreateContainerRequest, CreateTaskRequest, DeleteContainerRequest, - DeleteTaskRequest, KillRequest, ListContainersRequest, ListTasksRequest, StartRequest, - WaitRequest, container::Runtime, - }, - tonic::Request, - with_namespace, -}; - -use std::{ - fs::{self, File}, sync::{Arc, Mutex}, time::Duration, }; @@ -36,7 +25,6 @@ use tokio::time::timeout; // config.json,dockerhub密钥 // const DOCKER_CONFIG_DIR: &str = "/var/lib/faasd/.docker/"; - // 命名空间(容器的) const NAMESPACE: &str = "default"; @@ -536,4 +524,4 @@ impl Service { } } //容器是容器,要先启动,然后才能运行任务 -//要想删除一个正在运行的Task,必须先kill掉这个task,然后才能删除。 +//要想删除一个正在运行的Task,必须先kill掉这个task,然后才能删除。 \ No newline at end of file