kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-04 17:35:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pull task environments into their own type to be reusable across drivers and executors

Browse Source
This commit is contained in:
Alex Dadgar
2015-09-26 17:56:14 -07:00
parent 148e415f43
commit 75f93ce9fb
5 changed files with 20 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/driver/java.go
View File

@@ -137,7 +137,7 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
// Build the argument list.
cmdArgs := []string{"-jar", filepath.Join(allocdir.TaskLocal, fName)}
if argRaw, ok := task.Config["args"]; ok {
parsed, err := args.ParseAndReplace(argRaw, envVars)
parsed, err := args.ParseAndReplace(argRaw, envVars.Map())
if err != nil {
return nil, err
}
@@ -149,7 +149,7 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
cmd := executor.Command("java", cmdArgs...)
// Populate environment variables
cmd.Command().Env = PopulateEnvironment(envVars)
cmd.Command().Env = envVars.List()
if err := cmd.Limit(task.Resources); err != nil {
return nil, fmt.Errorf("failed to constrain resources: %s", err)