burble/nomad-driver-containerd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix review comments.

Browse Source
This commit is contained in:
Shishir Mahajan 2020-09-16 16:00:03 -07:00
parent 9d94718869
commit 1f4864d824
No known key found for this signature in database
GPG Key ID: D41782E7688DEC4A
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
containerd/driver.go
View File

@ -358,8 +358,7 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
// Setup environment variables. // Setup environment variables.
var env []string var env []string
for key, val := range cfg.Env { for key, val := range cfg.Env {
// Don't override $PATH. if skipOverride(key) {
if key == "PATH" {
continue continue
} }
env = append(env, fmt.Sprintf("%s=%s", key, val)) env = append(env, fmt.Sprintf("%s=%s", key, val))
@ -411,6 +410,17 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
return handle, nil, nil return handle, nil, nil
} }
// skipOverride determines whether the environment variable (key) needs an override or not.
func skipOverride(key string) bool {
skipOverrideList := []string{"PATH"}
for _, k := range skipOverrideList {
if key == k {
return true
}
}
return false
}
// RecoverTask recreates the in-memory state of a task from a TaskHandle. // RecoverTask recreates the in-memory state of a task from a TaskHandle.
func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error { func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error {
if handle == nil { if handle == nil {