Skip to content

builder: make docker runtime configurable #3448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
syphar merged 1 commit into from
Aug 18, 2026
Merged

builder: make docker runtime configurable #3448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions crates/bin/docs_rs_builder/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use anyhow::{Result, bail};
use docs_rs_config::AppConfig;
use docs_rs_env_vars::{env, maybe_env, require_env};
use rustwide::cmd::DockerRuntime;
use std::{
num::ParseIntError,
ops::{Deref, RangeInclusive},
Expand Down Expand Up @@ -32,6 +33,8 @@ pub struct Config {
pub build_cpu_cores: Option<BuildCores>,
pub include_default_targets: bool,
pub disable_memory_limit: bool,
/// Docker runtime the builder should use.
pub docker_runtime: DockerRuntime,

// other module configs
pub build_limits: Arc<docs_rs_build_limits::Config>,
Expand All @@ -57,6 +60,7 @@ impl AppConfig for Config {
86400,
)?),
compiler_metrics_collection_path: maybe_env("DOCSRS_COMPILER_METRICS_PATH")?,
docker_runtime: maybe_env("DOCSRS_DOCKER_RUNTIME")?.unwrap_or_default(),
build_limits: Arc::new(docs_rs_build_limits::Config::from_environment()?),
};

Expand Down Expand Up @@ -266,6 +270,7 @@ mod tests {
include_default_targets: true,
disable_memory_limit: false,
build_limits: Arc::new(docs_rs_build_limits::Config::default()),
docker_runtime: DockerRuntime::default(),
}
}
}
3 changes: 2 additions & 1 deletion crates/bin/docs_rs_builder/src/docbuilder/rustwide_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ impl RustwideBuilder {
fn prepare_sandbox(&self, limits: &Limits) -> SandboxBuilder {
let builder = SandboxBuilder::new()
.memory_limit(Some(limits.memory()))
.enable_networking(limits.networking());
.enable_networking(limits.networking())
.docker_runtime(self.config.docker_runtime);

if let Some(cores) = &self.config.build_cpu_cores {
builder.cpuset_cpus(Some(cores.0.clone()))
Expand Down
Loading