run,job: Pass task param as environmental var to container

Signed-off-by: Alexander Jung <a.jung@lancs.ac.uk>
lancs-net · Dec 31, 2020 · 43f4b95 · 43f4b95
1 parent 32c7bd0
commit 43f4b95
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/job/task.go b/job/task.go
@@ -168,6 +168,11 @@ func (atr *ActiveTaskRun) Start() (int, time.Duration, error) {
     os.MkdirAll(workDir, os.ModePerm)
   }
 
+  var env []string
+  for _, param := range atr.Task.Params {
+    env = append(env, fmt.Sprintf("%s=%s", param.Name, param.Value))
+  }
+
   config := &run.RunnerConfig{
     Log:           atr.log,
     CacheDir:      atr.Task.cacheDir,
@@ -179,6 +184,7 @@ func (atr *ActiveTaskRun) Start() (int, time.Duration, error) {
     Devices:       atr.run.Devices,
     Inputs:        atr.Task.Inputs,
     Outputs:       atr.Task.Outputs,
+    Env:           env,
   }
   if atr.run.Path != "" {
     config.Path = atr.run.Path

diff --git a/run/run.go b/run/run.go
@@ -71,6 +71,7 @@ type RunnerConfig struct {
   AllowOverride    bool
   Inputs        *[]Input
   Outputs       *[]Output
+  Env            []string
 }
 
 type Runner interface {

diff --git a/run/runc.go b/run/runc.go
@@ -329,7 +329,7 @@ func (r *RuncRunner) Run() (int, time.Duration, error) {
 
   taskProcess := &libcontainer.Process{
     Cwd:    "/",
-    Env:    defaultEnvironment,
+    Env:    append(defaultEnvironment, r.Config.Env...),
     User:   "root",
     Stdout: r.log,
     Stderr: r.log,