From 7359534386a83b67e06832acf9fe3bbfb77ac820 Mon Sep 17 00:00:00 2001
From: Alex Huszagh <ahuszagh@gmail.com>
Date: Fri, 3 Jun 2022 08:37:57 -0500
Subject: [PATCH] Allow key-value pairs in config volumes.

Allow volumes to use the `["VOL=/path/to/volume"]' syntax as well, so
additional mount points can be defined by value in the config file.
---
 src/docker.rs | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/docker.rs b/src/docker.rs
index bc7c4c36e..6f9085696 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -52,6 +52,19 @@ pub fn register(target: &Target, verbose: bool) -> Result<()> {
         .run(verbose)
 }
 
+fn validate_env_var(var: &str) -> Result<(&str, Option<&str>)> {
+    let (key, value) = match var.split_once('=') {
+        Some((key, value)) => (key, Some(value)),
+        _ => (var, None),
+    };
+
+    if key == "CROSS_RUNNER" {
+        bail!("CROSS_RUNNER environment variable name is reserved and cannot be pass through");
+    }
+
+    Ok((key, value))
+}
+
 #[allow(clippy::too_many_arguments)] // TODO: refactor
 pub fn run(
     target: &Target,
@@ -114,19 +127,6 @@ pub fn run(
 
     let mut docker = docker_command("run")?;
 
-    let validate_env_var = |var: &str| -> Result<()> {
-        let var = match var.split_once('=') {
-            Some((key, _)) => key,
-            _ => var,
-        };
-
-        if var == "CROSS_RUNNER" {
-            bail!("CROSS_RUNNER environment variable name is reserved and cannot be pass through");
-        }
-
-        Ok(())
-    };
-
     for ref var in config.env_passthrough(target)? {
         validate_env_var(var)?;
 
@@ -136,9 +136,13 @@ pub fn run(
     }
     let mut env_volumes = false;
     for ref var in config.env_volumes(target)? {
-        validate_env_var(var)?;
+        let (var, value) = validate_env_var(var)?;
+        let value = match value {
+            Some(v) => Ok(v.to_string()),
+            None => env::var(var),
+        };
 
-        if let Ok(val) = env::var(var) {
+        if let Ok(val) = value {
             let host_path: PathBuf;
             let mount_path: PathBuf;