Prune images after container exits

Author: msmith-techempower

Cargo.lock

@@ -22,5 +22,5 @@ regex = "1.4.3"
 lazy_static = "1.4.0"
 uuid = "0.8.2"
 rand = "0.8.2"
-dockurl = "0.1.4"
+dockurl = "0.1.5"
 #dockurl = { path = "../dockurl" }

Cargo.toml

@@ -24,7 +24,7 @@ use crate::io::{report_verifications, Logger};
 use crate::results::{BenchmarkData, Results};
 use colored::Colorize;
 use curl::easy::Easy2;
-use dockurl::container::{inspect_container, stop_container};
+use dockurl::container::inspect_container;
 use std::collections::HashMap;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
@@ -331,6 +331,7 @@ impl<'a> Benchmarker<'a> {
         }
 
         self.trip();
+        self.stop_containers();
         report_verifications(verifications, logger)?;
 
         if succeeded {
@@ -803,21 +804,7 @@ impl<'a> Benchmarker<'a> {
             self.trip();
             if slept_for > 60 {
                 self.trip();
-                stop_container(
-                    &container_ids.0,
-                    &self.docker_config.server_docker_host,
-                    self.docker_config.use_unix_socket,
-                    Simple::new(),
-                )?;
-                if let Some(database_container_id) = &container_ids.1 {
-                    self.trip();
-                    stop_container(
-                        database_container_id,
-                        &self.docker_config.database_docker_host,
-                        self.docker_config.use_unix_socket,
-                        Simple::new(),
-                    )?;
-                }
+                self.stop_containers();
 
                 return Err(NoResponseFromDockerContainerError);
             }

src/benchmarker.rs

@@ -24,7 +24,7 @@ use dockurl::container::{
     attach_to_container, delete_container, get_container_logs, inspect_container, kill_container,
     wait_for_container_to_exit,
 };
-use dockurl::image::delete_image;
+use dockurl::image::{delete_image, delete_unused_images};
 use dockurl::network::NetworkMode;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
@@ -542,7 +542,7 @@ pub fn stop_docker_container_future(
                     use_unix_socket,
                     Simple::new(),
                 )
-                .unwrap_or(());
+                .unwrap();
 
                 if docker_clean_up {
                     delete_container(
@@ -554,7 +554,7 @@ pub fn stop_docker_container_future(
                         true,
                         false,
                     )
-                    .unwrap_or(());
+                    .unwrap();
                 }
 
                 container.unregister();
@@ -570,6 +570,15 @@ pub fn stop_docker_container_future(
                         Simple::new(),
                     )
                     .unwrap();
+
+                    // Todo - this is jank... do this better.
+                    delete_unused_images(
+                        "{\"dangling\":[\"true\"]}",
+                        &container.docker_host,
+                        use_unix_socket,
+                        Simple::new(),
+                    )
+                    .unwrap();
                 }
             }
             container.image_id = None;