Remove unused imports, list docker containers added

Author: vsilent

Cargo.toml

@@ -8,12 +8,13 @@ edition = "2018"
 features = ["openssl", "rustls", "compress", "secure-cookies"]
 
 [dependencies]
-actix-web = { version = "3.0.0-beta.3", features=["rustls"] }
+bollard = "0.11"
+actix-web = { version = "3.3.3", features=["rustls"] }
 actix-rt = "2.1.0"
-actix-service = "2.0.0"
-actix-cors = "0.5.4"
+actix-service = "1.0.6"
+actix-cors = "0.3.0"
 actix-http = "2.1.0"
-actix = "0.12"
+#actix = "0.12"
 log = "0.4.11"
 env_logger = "0.9.0"
 serde = "1.0.116"

docker-compose.yml

@@ -9,10 +9,10 @@ services:
     build:
       context: .
       dockerfile: docker/local/Dockerfile
-    entrypoint: [ 'bash', '-c', 'sleep infinity' ]
+#    entrypoint: [ 'bash', '-c', 'sleep infinity' ]
 #    restart: always
     ports:
-    - "5000:5000"
+    - "5003:5000"
     env_file: .env
     volumes:
       - db:/app/db

docker/local/Dockerfile

@@ -11,6 +11,8 @@ WORKDIR /app
 # copy manifests
 COPY ./Cargo.toml ./Cargo.toml
 
+COPY ./migrations /app/migrations
+
 # build this project to cache dependencies
 RUN cargo build --release; \
     rm src/*.rs
@@ -34,7 +36,7 @@ WORKDIR /app
 
 # install libpq
 RUN apt-get update; \
-    apt-get install --no-install-recommends -y libpq-dev; \
+    apt-get install --no-install-recommends -y libpq-dev sqlite3 libsqlite3-dev; \
     rm -rf /var/lib/apt/lists/*
 
 # copy binary and configuration files
@@ -43,7 +45,7 @@ COPY --from=build /app/.env .
 
 # expose port
 EXPOSE 5000
-
+RUN mkdir /app/db
 RUN /usr/bin/sqlite3 /app/db/stackdog.db
 
 # run the binary

docker/prod/Dockerfile

@@ -13,9 +13,9 @@ RUN apt-get update; \
 # copy binary and configuration files
 COPY ./stackdog .
 COPY ./.env .
-
+COPY ./migrations .
 # expose port
 EXPOSE 5000
 
 # run the binary
-ENTRYPOINT ["/app/stackdog"]
+ENTRYPOINT ["/app/stackdog"]

src/api/docker_controller.rs

@@ -1,16 +1,12 @@
 use crate::{
-    config::db::Pool,
-    constants,
-    models::{
-        response::ResponseBody,
-    },
-    services::docker_service,
+    constants, models::response::ResponseBody, services::docker_service,
 };
-use actix_web::{web, HttpRequest, HttpResponse, Result};
+use actix_web::{HttpResponse, Result};
 
-pub async fn find_all(pool: web::Data<Pool>) -> Result<HttpResponse> {
-    match docker_service::find_all(&pool) {
-        Ok(message) => Ok(HttpResponse::Ok().json(ResponseBody::new(&message, constants::EMPTY))),
+pub async fn find_all() -> Result<HttpResponse> {
+    match docker_service::find_all().await {
+        Ok(message) => Ok(HttpResponse::Ok().json(
+            ResponseBody::new(constants::EMPTY, &message))),
         Err(err) => Ok(err.response()),
     }
 }

src/config/db.rs

@@ -7,9 +7,6 @@ use diesel::{
 };
 use crate::schema::users::columns::updated_at;
 use chrono::Utc;
-use diesel::connection::SimpleConnection;
-use crate::schema::users::dsl::users;
-use diesel::RunQueryDsl;
 
 embed_migrations!();
 

src/constants.rs

@@ -1,5 +1,4 @@
 // Messages
-pub const MESSAGE_OK: &str = "ok";
 pub const MESSAGE_LOGIN_SUCCESS: &str = "Login successfully";
 pub const MESSAGE_LOGIN_FAILED: &str = "Wrong username or password, please try again";
 pub const MESSAGE_USER_NOT_FOUND: &str = "User not found";

src/models/user.rs

@@ -1,5 +1,4 @@
 use crate::{
-    constants,
     config::db::Connection,
     models::{user_token::UserToken},
     schema::users::{self, dsl::*},

src/services/docker_service.rs

@@ -1,22 +1,37 @@
+use std::collections::HashMap;
+use bollard::container::ListContainersOptions;
+use bollard::Docker;
+use serde_json;
+
 use crate::{
-    error::ServiceError,
-    config::db::Pool,
+    error::ServiceError
 };
 use actix_web::{
-    // http::{
-    //     StatusCode,
-    //     header::HeaderValue,
-    // },
-    web,
+    http::{
+        StatusCode,
+    }
 };
 
-pub fn find_all(pool: &web::Data<Pool>) -> Result<String, ServiceError> {
-    // docker
-    // Here we need to discuss how to connect docker api
-    // let docker = // docker api client;
-    // match docker::find_all(&pool.get().unwrap()) {
-    //     Ok(message) => Ok(message),
-    //     Err(message) => Err(ServiceError::new(StatusCode::BAD_REQUEST, message))
+pub async fn find_all() -> Result<String, ServiceError> {
+    let docker = Docker::connect_with_local_defaults().unwrap();
+    let mut list_container_filters = HashMap::new();
+    list_container_filters.insert("status", vec!["running"]);
+
+    let containers = &docker
+        .list_containers(Some(ListContainersOptions {
+            all: true,
+            filters: list_container_filters,
+            ..Default::default()
+        }))
+        .await;
+    // let c = containers.iter().collect::<String>();
+    // let mut names = Vec::new();
+    // for container in containers {
+    //     names.push(container.);
     // }
-    unimplemented!()
+    match containers {
+        Err(_)=> Err(ServiceError::new(StatusCode::NO_CONTENT,
+                                  "No containers found".to_string())),
+        Ok(cs) => Ok(serde_json::to_string(cs).unwrap()),
+    }
 }

web/README.md

@@ -14,6 +14,12 @@ OR
 `docker build . -t stackdog`
 `docker run -p8080:8080 stackdog`
 
+## Test API
+
+
+
+
+
 ## Production build
 
 `npm install`