Merge #771

771: Fix parsing of docker options. r=Emilgardis a=Alexhuszagh

Fix parsing `DOCKER_OPTS` to correctly parse them as shell words, rather than splitting on whitespace.

Closes #769.

Co-authored-by: Alex Huszagh <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -37,6 +37,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- #771 - fix parsing of `DOCKER_OPTS`.
 - #727 - add `PKG_CONFIG_PATH` to all `*-linux-gnu` images.
 - #722 - boolean environment variables are evaluated as truthy or falsey.
 - #720 - add android runner to preload `libc++_shared.so`.

Cargo.lock

@@ -27,6 +27,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_yaml = { version = "0.8", optional = true }
 serde_ignored = "0.1.2"
+shell-words = "1.1.0"
 
 [target.'cfg(not(windows))'.dependencies]
 nix = { version = "0.24", default-features = false, features = ["user"] }

Cargo.toml

@@ -312,7 +312,8 @@ pub fn run(
     }
 
     if let Ok(value) = env::var("DOCKER_OPTS") {
-        let opts: Vec<&str> = value.split(' ').collect();
+        let opts = shell_words::split(&value)
+            .wrap_err_with(|| format!("could not parse docker opts of {}", value))?;
         docker.args(&opts);
     }