Implement Docker integration with BollardAdapter; add Dockerfile, docker-compose, and update dependencies

.woodpecker/test.yml

@@ -0,0 +1,10 @@
+steps:
+  - name: clippy
+    image: rust:${RUST_VERSION}
+    commands:
+      - cargo clippy --all-targets --all-features -- -D warnings
+
+matrix:
+  RUST_VERSION:
+    - "1.91.1"
+    - "1.91.0"

Cargo.lock

@@ -30,6 +30,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -54,6 +65,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-compression",
+ "async-trait",
  "bollard",
  "tokio",
  "tokio-tar",

Cargo.toml

@@ -9,3 +9,4 @@ async-compression = { version = "0.4", features = ["tokio", "xz"] }
 bollard = "0.19"
 anyhow = "1.0"
 tokio-tar = "0.3"
+async-trait = "0.1"

Dockerfile

@@ -0,0 +1,11 @@
+FROM rust:1.91.1
+
+WORKDIR /beekeper
+
+COPY src/ src/
+COPY Cargo.toml .
+COPY Cargo.lock .
+
+RUN cargo build --release
+
+CMD ["./target/release/beekeper"]

src/docker/bollard.rs

@@ -0,0 +1,49 @@
+use bollard::Docker;
+use std::sync::{Arc, Mutex};
+
+pub struct BollardAdapter {
+    client: Arc<Mutex<Option<Docker>>>,
+}
+
+impl BollardAdapter {
+    pub fn new() -> Self {
+        Self {
+            client: Arc::new(Mutex::new(None)),
+        }
+    }
+}
+
+impl crate::docker::DockerAdapter for BollardAdapter {
+    async fn connect_docker(&self, docker_host: Option<String>) -> anyhow::Result<()> {
+        let docker = match docker_host {
+            Some(host) => Docker::connect_with_http(&host, 60, bollard::API_DEFAULT_VERSION)?,
+            None => Docker::connect_with_socket_defaults()?,
+        };
+
+        docker.ping().await?;
+
+        let mut client = self.client.lock().unwrap();
+        *client = Some(docker);
+
+        Ok(())
+    }
+
+    async fn list_service_with_label(&self, label: &str) -> anyhow::Result<Vec<String>> {
+        Ok(vec![])
+    }
+
+    async fn shutdown_service(&self, service_name: &str) -> anyhow::Result<()> {
+        Ok(())
+    }
+
+    async fn start_service(&self, service_name: &str) -> anyhow::Result<()> {
+        Ok(())
+    }
+}
+
+impl Default for BollardAdapter {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+

src/docker/mod.rs

@@ -0,0 +1,24 @@
+mod bollard;
+
+pub use bollard::BollardAdapter;
+
+pub struct Docker<T: DockerAdapter> {
+    adapter: T,
+}
+
+impl<T: DockerAdapter> Docker<T> {
+    pub fn new(adapter: T) -> Self {
+        Self { adapter }
+    }
+
+    pub async fn connect_docker(&self, docker_host: Option<String>) -> anyhow::Result<()> {
+        self.adapter.connect_docker(docker_host).await
+    }
+}
+
+pub trait DockerAdapter {
+    async fn connect_docker(&self, docker_host: Option<String>) -> anyhow::Result<()>;
+    async fn list_service_with_label(&self, label: &str) -> anyhow::Result<Vec<String>>;
+    async fn shutdown_service(&self, service_name: &str) -> anyhow::Result<()>;
+    async fn start_service(&self, service_name: &str) -> anyhow::Result<()>;
+}

src/main.rs

@@ -1,26 +1,30 @@
-use bollard::Docker;
+mod docker;
+
+use docker::{BollardAdapter, Docker};
+
+struct AppEnvVars {
+    backup_folder: String,
+    docker_host: Option<String>,
+}
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    let backup_root_folder = std::env::var("BACKUP_FOLDER")?;
+    let envs = load_envs()?;
-    let backup_root_path = std::path::Path::new(&backup_root_folder);
 
+    let backup_root_path = std::path::Path::new(&envs.backup_folder);
     let folders = list_folders(backup_root_path).await?;
 
-    let docker_host = std::env::var("DOCKER_HOST").ok();
+    let docker_conn = connect_docker(envs.docker_host).await?;
-    let docker_conn = connect_docker(docker_host).await?;
-    
 
     Ok(())
 }
 
-async fn connect_docker(docker_host: Option<String>) -> anyhow::Result<Docker> {
+async fn connect_docker(docker_host: Option<String>) -> anyhow::Result<Docker<BollardAdapter>> {
-    Ok(
+    let adapter = BollardAdapter::new();
-        match docker_host {
+    let docker = Docker::new(adapter);
-            Some(host) => Docker::connect_with_http(&host, 60, bollard::API_DEFAULT_VERSION)?,
+    docker.connect_docker(docker_host).await?;
-            None => Docker::connect_with_socket_defaults()?,
+
-        }
+    Ok(docker)
-    )
 }
 
 async fn list_folders(path: &std::path::Path) -> anyhow::Result<Vec<std::path::PathBuf>> {
@@ -35,3 +39,15 @@ async fn list_folders(path: &std::path::Path) -> anyhow::Result<Vec<std::path::P
 
     Ok(folders)
 }
+
+fn load_envs() -> anyhow::Result<AppEnvVars> {
+    let backup_folder = std::env::var("BACKUP_FOLDER")?;
+    let docker_host = std::env::var("DOCKER_HOST").ok();
+
+    Ok(
+        AppEnvVars {
+            backup_folder,
+            docker_host,
+        }
+    )
+}