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

ParseAndReplace args at the executor level

Browse Source
This commit is contained in:
Alex Dadgar
2015-09-27 12:17:51 -07:00
parent 17b2fb4600
commit 6d8a913242
4 changed files with 77 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/driver/java.go
View File

@@ -16,7 +16,6 @@ import (
"github.com/hashicorp/nomad/client/allocdir"
"github.com/hashicorp/nomad/client/config"
"github.com/hashicorp/nomad/client/driver/args"
"github.com/hashicorp/nomad/client/executor"
"github.com/hashicorp/nomad/nomad/structs"
)
@@ -135,18 +134,14 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
envVars := TaskEnvironmentVariables(ctx, task)
// Build the argument list.
cmdArgs := []string{"-jar", filepath.Join(allocdir.TaskLocal, fName)}
args := []string{"-jar", filepath.Join(allocdir.TaskLocal, fName)}
if argRaw, ok := task.Config["args"]; ok {
parsed, err := args.ParseAndReplace(argRaw, envVars.Map())
if err != nil {
return nil, err
}
cmdArgs = append(cmdArgs, parsed...)
args = append(args, argRaw)
}
// Setup the command
// Assumes Java is in the $PATH, but could probably be detected
cmd := executor.Command("java", cmdArgs...)
cmd := executor.Command("java", args...)
// Populate environment variables
cmd.Command().Env = envVars.List()