Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ reqwest = { version = "0.13", features = ["blocking", "json", "gzip"] }
jiff = { version = "0.2.15", features = ["serde"] }
rusqlite = { version = "0.39", features = ["chrono", "functions", "bundled"] }
rust_team_data = { git = "https://github.com/rust-lang/team" }
rustwide = { version = "0.25.0", features = [
rustwide = { version = "0.26.0", features = [
"unstable",
"unstable-toolchain-ci",
] }
Expand Down
25 changes: 25 additions & 0 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use crate::prelude::*;
use crate::utils::size::Size;
use log::LevelFilter;
use regex::Regex;
use rustwide::cmd::DockerRuntime;
use rustwide::logging::LogStorage;
use std::collections::{HashMap, HashSet};
use std::env;
Expand Down Expand Up @@ -75,6 +76,29 @@ pub struct SandboxConfig {
pub memory_limit: Size,
pub build_log_max_size: Size,
pub build_log_max_lines: usize,
#[serde(default, with = "docker_runtime_serde")]
pub docker_runtime: DockerRuntime,
}

mod docker_runtime_serde {
use rustwide::cmd::DockerRuntime;
use serde::{de::Error, Deserialize, Deserializer, Serializer};

pub fn serialize<S>(runtime: &DockerRuntime, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
serializer.collect_str(runtime)
}

pub fn deserialize<'de, D>(deserializer: D) -> Result<DockerRuntime, D::Error>
where
D: Deserializer<'de>,
{
String::deserialize(deserializer)?
.parse()
.map_err(D::Error::custom)
}
}

#[derive(Clone, Serialize, Deserialize)]
Expand Down Expand Up @@ -241,6 +265,7 @@ impl Default for Config {
memory_limit: Size::Gigabytes(2),
build_log_max_size: Size::Megabytes(1),
build_log_max_lines: 1000,
docker_runtime: DockerRuntime::default(),
},
server: ServerConfig {
bot_acl: BotACL {
Expand Down
1 change: 1 addition & 0 deletions src/runner/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ pub(super) fn run_test(
);
let sandbox = SandboxBuilder::new()
.memory_limit(Some(ctx.config.sandbox.memory_limit.to_bytes()))
.docker_runtime(ctx.config.sandbox.docker_runtime)
.enable_networking(false)
.source_dir_mount_kind(ctx.mount_kind);

Expand Down
Loading