luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #5140 from hashicorp/dani/b-taskrunner 

taskrunner: Persist environment from hooks
This commit is contained in:
Preetha 2019-01-03 09:30:52 -06:00 committed by GitHub
parent 4a944e114e 28aa34ea78
commit 8078cb79f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/allocrunner/taskrunner/task_runner_hooks.go
View File

@ -218,9 +218,9 @@ func (tr *TaskRunner) prestart() error {
// Store the environment variables returned by the hook
if name == HookNameDevices {
tr.envBuilder.SetDeviceHookEnv(name, origHookState.Env)
tr.envBuilder.SetDeviceHookEnv(name, resp.Env)
} else {
tr.envBuilder.SetHookEnv(name, origHookState.Env)
tr.envBuilder.SetHookEnv(name, resp.Env)
}
// Store the resources