Add keep_container option for debugging

Author: prasmussen

run.sh

@@ -23,6 +23,8 @@ export DOCKER_CONTAINER_CAP_DROP="MKNOD NET_RAW NET_BIND_SERVICE"
 export RUN_MAX_EXECUTION_TIME="10"
 export RUN_MAX_OUTPUT_SIZE="100000"
 
+export DEBUG_KEEP_CONTAINER="false"
+
 export RUST_LOG=debug
 
 cargo run

src/docker_run/api/run.rs

@@ -22,7 +22,7 @@ pub fn handle(config: &config::Config, request: &mut tiny_http::Request) -> Resu
         container_config,
         payload: req_body.payload,
         limits: config.run.clone(),
-    }).map_err(handle_error)?;
+    }, config.debug.clone()).map_err(handle_error)?;
 
     api::prepare_json_response(&run_result, api::JsonFormat::Minimal)
 }

src/docker_run/config.rs

@@ -1,6 +1,7 @@
 use crate::docker_run::unix_stream;
 use crate::docker_run::run;
 use crate::docker_run::api;
+use crate::docker_run::debug;
 
 #[derive(Clone, Debug)]
 pub struct Config {
@@ -9,6 +10,7 @@ pub struct Config {
     pub unix_socket: unix_stream::Config,
     pub container: run::ContainerConfig,
     pub run: run::Limits,
+    pub debug: debug::Config,
 }
 
 

src/docker_run/debug.rs

@@ -0,0 +1,4 @@
+#[derive(Clone, Debug)]
+pub struct Config {
+    pub keep_container: bool,
+}

src/docker_run/mod.rs

@@ -5,3 +5,4 @@ pub mod config;
 pub mod environment;
 pub mod api;
 pub mod unix_stream;
+pub mod debug;

src/docker_run/run.rs

@@ -8,6 +8,7 @@ use std::net;
 
 use crate::docker_run::docker;
 use crate::docker_run::unix_stream;
+use crate::docker_run::debug;
 
 
 #[derive(Debug)]
@@ -26,7 +27,7 @@ pub struct Limits {
 
 
 
-pub fn run<T: Serialize>(stream_config: unix_stream::Config, run_request: RunRequest<T>) -> Result<Map<String, Value>, Error> {
+pub fn run<T: Serialize>(stream_config: unix_stream::Config, run_request: RunRequest<T>, debug: debug::Config) -> Result<Map<String, Value>, Error> {
     let container_response = unix_stream::with_stream(&stream_config, Error::UnixStream, |stream| {
         docker::create_container(stream, &run_request.container_config)
             .map_err(Error::CreateContainer)
@@ -36,17 +37,19 @@ pub fn run<T: Serialize>(stream_config: unix_stream::Config, run_request: RunReq
 
     let result = run_with_container(&stream_config, run_request, &container_id);
 
-    let _ = unix_stream::with_stream(&stream_config, Error::UnixStream, |stream| {
-        match docker::remove_container(stream, &container_id) {
-            Ok(_) => {}
+    if !debug.keep_container {
+        let _ = unix_stream::with_stream(&stream_config, Error::UnixStream, |stream| {
+            match docker::remove_container(stream, &container_id) {
+                Ok(_) => {}
 
-            Err(err) => {
-                log::error!("Failed to remove container: {}", err);
+                Err(err) => {
+                    log::error!("Failed to remove container: {}", err);
+                }
             }
-        }
 
-        Ok(())
-    });
+            Ok(())
+        });
+    }
 
     result
 }

src/main.rs

@@ -13,6 +13,7 @@ use docker_run::environment;
 use docker_run::unix_stream;
 use docker_run::run;
 use docker_run::api;
+use docker_run::debug;
 
 
 fn main() {
@@ -148,13 +149,15 @@ fn build_config(env: &environment::Environment) -> Result<config::Config, enviro
     let unix_socket = build_unix_socket_config(env)?;
     let container = build_container_config(env)?;
     let run = build_run_config(env)?;
+    let debug = build_debug_config(env)?;
 
     Ok(config::Config{
         server,
         api,
         unix_socket,
         container,
         run,
+        debug,
     })
 }
 
@@ -225,3 +228,11 @@ fn build_run_config(env: &environment::Environment) -> Result<run::Limits, envir
         max_output_size,
     })
 }
+
+fn build_debug_config(env: &environment::Environment) -> Result<debug::Config, environment::Error> {
+    let keep_container = environment::lookup(env, "DEBUG_KEEP_CONTAINER").unwrap_or(false);
+
+    Ok(debug::Config{
+        keep_container,
+    })
+}