Switch back to static container environment

We have moved all variables to task arguments, so only the very basics
are left in the container environment.

1 files changed, 0 insertions, 16 deletions

diff --git a/src/executor.rs b/src/executor.rs
index cbefeb4..39a7cc9 100644
--- a/src/executor.rs
+++ b/src/executor.rs
@@ -19,18 +19,12 @@ const BASE_ARGS: &[(&str, &str)] = &[
 	("destdir", "/build/dest"),
 ];
 
-const TASK_ENV: &[(&str, &str)] = &[
-	("PATH", "/usr/sbin:/usr/bin:/sbin:/bin"),
-	("HOME", "/build"),
-];
-
 #[derive(Clone, Debug, Serialize)]
 struct TaskInput<'ctx> {
 	pub inherit: Option<&'ctx InputHash>,
 	pub depends: &'ctx HashMap<DependencyHash, Dependency>,
 	pub output: &'ctx HashMap<String, String>,
 	pub command: &'ctx str,
-	pub env: &'ctx HashMap<String, String>,
 }
 
 impl<'ctx> TaskInput<'ctx> {
@@ -80,18 +74,12 @@ pub struct Executor<'ctx> {
 	tasks_runnable: Vec<TaskRef<'ctx>>,
 	tasks_done: HashMap<TaskRef<'ctx>, TaskMeta>,
 	rdeps: HashMap<TaskRef<'ctx>, Vec<TaskRef<'ctx>>>,
-	env: HashMap<String, String>,
 	base_args: TaskArgs,
 	tpl: TemplateEngine,
 }
 
 impl<'ctx> Executor<'ctx> {
 	pub fn new(ctx: &'ctx Context, taskset: HashSet<TaskRef<'ctx>>) -> Result<Self> {
-		let env: HashMap<String, String> = TASK_ENV
-			.iter()
-			.map(|(k, v)| (k.to_string(), v.to_string()))
-			.collect();
-
 		let base_args = TaskArgs(BASE_ARGS.iter().map(|(k, v)| args::arg(k, v)).collect());
 
 		let mut exc = Executor {
@@ -100,7 +88,6 @@ impl<'ctx> Executor<'ctx> {
 			tasks_runnable: Vec::new(),
 			tasks_done: HashMap::new(),
 			rdeps: HashMap::new(),
-			env,
 			base_args,
 			tpl: TemplateEngine::new(),
 		};
@@ -179,7 +166,6 @@ impl<'ctx> Executor<'ctx> {
 				)
 			})
 			.collect();
-		let env = self.env.clone();
 
 		let (inherit_chain, inherit_hash) =
 			if let Some(inherit_dep) = self.ctx.get_inherit_depend(task_ref) {
@@ -202,7 +188,6 @@ impl<'ctx> Executor<'ctx> {
 			depends: &task_deps,
 			output: &task_output,
 			command: &command,
-			env: &env,
 		}
 		.input_hash();
 
@@ -225,7 +210,6 @@ impl<'ctx> Executor<'ctx> {
 			inherit: inherit_chain.clone(),
 			depends: task_deps.clone(),
 			output: task_output,
-			env,
 		};
 
 		let output = runner.run(&task)?;