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

fixup: executorplugin: fix rkt build

Browse Source
This commit is contained in:
Danielle Tomlinson
2018-11-29 14:59:53 +01:00
parent db31a9cd99
commit 5262e42d62
17 changed files with 65 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/java/driver.go
View File

@@ -13,7 +13,6 @@ import (
"github.com/hashicorp/consul-template/signals"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-plugin"
dstructs "github.com/hashicorp/nomad/client/driver/structs"
"github.com/hashicorp/nomad/client/fingerprint"
cstructs "github.com/hashicorp/nomad/client/structs"
"github.com/hashicorp/nomad/drivers/shared/eventer"
@@ -21,6 +20,7 @@ import (
"github.com/hashicorp/nomad/plugins/base"
"github.com/hashicorp/nomad/plugins/drivers"
"github.com/hashicorp/nomad/plugins/drivers/utils"
pexecutor "github.com/hashicorp/nomad/plugins/executor"
"github.com/hashicorp/nomad/plugins/shared"
"github.com/hashicorp/nomad/plugins/shared/hclspec"
"github.com/hashicorp/nomad/plugins/shared/loader"
@@ -320,7 +320,7 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *cstru
handle.Config = cfg
pluginLogFile := filepath.Join(cfg.TaskDir().Dir, "executor.out")
executorConfig := &dstructs.ExecutorConfig{
executorConfig := &pexecutor.ExecutorConfig{
LogFile: pluginLogFile,
LogLevel: "debug",
}