add env.variables for setting variables directly

Author: Emilgardis

docs/cross_toml.md

@@ -18,6 +18,7 @@ For example:
 [build.env]
 volumes = ["VOL1_ARG", "VOL2_ARG"]
 passthrough = ["IMPORTANT_ENV_VARIABLES"]
+var.ARG1 = "value"
 ```
 
 # `target.TARGET`
@@ -38,4 +39,5 @@ This is similar to `build.env`, but allows you to be more specific per target.
 [target.x86_64-unknown-linux-gnu.env]
 volumes = ["VOL1_ARG", "VOL2_ARG"]
 passthrough = ["IMPORTANT_ENV_VARIABLES"]
-```
+var.ARG1 = "value"
+```

src/config.rs

@@ -185,6 +185,18 @@ impl Config {
         Ok(collected)
     }
 
+    
+    pub fn env_variables(&self, target: &Target) -> HashMap<String, String> {
+        // Does not support env variable config, that would make not much sense
+        if let Some(ref toml) = self.toml {
+            let mut map = toml.env_variable_target(target);
+            map.extend(toml.env_variable_build());
+            map
+        } else {
+            HashMap::new()
+        }
+    }
+
     pub fn target(&self, target_list: &TargetList) -> Option<Target> {
         if let Some(env_value) = self.env.target() {
             return Some(Target::from(&env_value, target_list));

src/cross_toml.rs

@@ -12,6 +12,8 @@ pub struct CrossEnvConfig {
     volumes: Vec<String>,
     #[serde(default)]
     passthrough: Vec<String>,
+    #[serde(default, alias = "var")]
+    variable: HashMap<String, String>,
 }
 
 /// Build configuration
@@ -79,17 +81,28 @@ impl CrossToml {
             .map_or(Vec::new(), |t| t.env.passthrough.clone())
     }
 
-    /// Returns the list of environment variables to pass through for `build`,
+    /// Returns the list of environment variables to use for/as volumes in `build`,
     pub fn env_volumes_build(&self) -> Vec<String> {
         self.build.env.volumes.clone()
     }
 
-    /// Returns the list of environment variables to pass through for `target`,
+    /// Returns the list of environment variables to use for/as volumes in `target`,
     pub fn env_volumes_target(&self, target: &Target) -> Vec<String> {
         self.get_target(target)
             .map_or(Vec::new(), |t| t.env.volumes.clone())
     }
 
+    /// Returns the list of environment variables to set and pass through
+    pub fn env_variable_target(&self, target: &Target) -> HashMap<String, String> {
+        self.get_target(target)
+            .map_or(HashMap::new(), |t| t.env.variable.clone())
+    }
+
+    /// Returns the list of environment variables to set and pass through
+    pub fn env_variable_build(&self) -> HashMap<String, String> {
+        self.build.env.variable.clone()
+    }
+
     /// Returns the default target to build,
     pub fn default_target(&self, target_list: &TargetList) -> Option<Target> {
         self.build
@@ -129,6 +142,7 @@ mod tests {
                 env: CrossEnvConfig {
                     volumes: vec!["VOL1_ARG".to_string(), "VOL2_ARG".to_string()],
                     passthrough: vec!["VAR1".to_string(), "VAR2".to_string()],
+                    variable: [("ARG1".to_owned(), "value".to_owned())].into(),
                 },
                 xargo: Some(true),
                 default_target: None,
@@ -142,6 +156,7 @@ mod tests {
           [build.env]
           volumes = ["VOL1_ARG", "VOL2_ARG"]
           passthrough = ["VAR1", "VAR2"]
+          var.ARG1 = "value"
         "#;
         let parsed_cfg = CrossToml::from_str(test_str)?;
 
@@ -161,6 +176,7 @@ mod tests {
                 env: CrossEnvConfig {
                     passthrough: vec!["VAR1".to_string(), "VAR2".to_string()],
                     volumes: vec!["VOL1_ARG".to_string(), "VOL2_ARG".to_string()],
+                    variable: [("ARG1".to_owned(), "value".to_owned())].into(),
                 },
                 xargo: Some(false),
                 image: Some("test-image".to_string()),
@@ -177,6 +193,7 @@ mod tests {
             [target.aarch64-unknown-linux-gnu.env]
             volumes = ["VOL1_ARG", "VOL2_ARG"]
             passthrough = ["VAR1", "VAR2"]
+            var.ARG1 = "value"
             [target.aarch64-unknown-linux-gnu]
             xargo = false
             image = "test-image"

src/docker.rs

@@ -133,6 +133,13 @@ pub fn run(
         // flag forwards the value from the parent shell
         docker.args(&["-e", var]);
     }
+
+    for (ref var, ref value) in config.env_variables(target) {
+        validate_env_var(var)?;
+
+        docker.args(&["-e", &format!("{var}={value}")]);
+    }
+
     let mut env_volumes = false;
     for ref var in config.env_volumes(target)? {
         validate_env_var(var)?;