Skip to content

Commit 6045772

Browse files
Merge pull request #39 from Roblox/env_path
Don't override $(PATH) environment variable.
2 parents 5736579 + 1f4864d commit 6045772

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

containerd/driver.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,9 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
358358
// Setup environment variables.
359359
var env []string
360360
for key, val := range cfg.Env {
361+
if skipOverride(key) {
362+
continue
363+
}
361364
env = append(env, fmt.Sprintf("%s=%s", key, val))
362365
}
363366

@@ -407,6 +410,17 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
407410
return handle, nil, nil
408411
}
409412

413+
// skipOverride determines whether the environment variable (key) needs an override or not.
414+
func skipOverride(key string) bool {
415+
skipOverrideList := []string{"PATH"}
416+
for _, k := range skipOverrideList {
417+
if key == k {
418+
return true
419+
}
420+
}
421+
return false
422+
}
423+
410424
// RecoverTask recreates the in-memory state of a task from a TaskHandle.
411425
func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error {
412426
if handle == nil {

0 commit comments

Comments
 (0)