kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-10 12:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

taskrunner: Persist environment from hooks

Browse Source 
https://github.com/hashicorp/nomad/pull/5032 introduced a regression
where the origHookState was used in place of the response from the hook.
This commit is contained in:
Danielle Tomlinson
2019-01-03 13:13:57 +01:00
parent c64b41d154
commit 54dde24bcb
1 changed files with 2 additions and 2 deletions
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