From 967088484df0a5a805124cf0d2f314fb2802d306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 19 Jan 2019 15:55:24 +0000 Subject: [PATCH] Support mounting on SELinux This should allow `cross` to work on both non-SELinux enabled systems and SELinux ones. --- src/docker.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/docker.rs b/src/docker.rs index 1525b8734..aadcbd33c 100644 --- a/src/docker.rs +++ b/src/docker.rs @@ -153,12 +153,12 @@ pub fn run(target: &Target, docker .args(&["-e", &format!("CROSS_RUNNER={}", runner.unwrap_or_else(|| String::new()))]) - .args(&["-v", &format!("{}:/xargo", xargo_dir.display())]) - .args(&["-v", &format!("{}:/cargo", cargo_dir.display())]) + .args(&["-v", &format!("{}:/xargo:Z", xargo_dir.display())]) + .args(&["-v", &format!("{}:/cargo:Z", cargo_dir.display())]) .args(&["-v", "/cargo/bin"]) // Prevent `bin` from being mounted inside the Docker container. - .args(&["-v", &format!("{}:/project:ro", root.display())]) - .args(&["-v", &format!("{}:/rust:ro", sysroot.display())]) - .args(&["-v", &format!("{}:/target", target_dir.display())]) + .args(&["-v", &format!("{}:/project:Z,ro", root.display())]) + .args(&["-v", &format!("{}:/rust:Z,ro", sysroot.display())]) + .args(&["-v", &format!("{}:/target:Z", target_dir.display())]) .args(&["-w", "/project"]) .args(&["-it", &image(toml, target)?]) .args(&["sh", "-c", &format!("PATH=$PATH:/rust/bin {:?}", cmd)])