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

Fix env vars relating to secretdir

Browse Source
This commit is contained in:
Alex Dadgar
2016-11-08 12:28:43 -08:00
parent 1199995eb0
commit 17cab6e932
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/driver/docker.go
View File

@@ -466,7 +466,7 @@ func (d *DockerDriver) createContainerConfig(ctx *ExecContext, task *structs.Tas
// Set environment variables.
d.taskEnv.SetAllocDir(allocdir.SharedAllocContainerPath)
d.taskEnv.SetTaskLocalDir(allocdir.TaskLocalContainerPath)
d.taskEnv.SetTaskLocalDir(allocdir.TaskSecretsContainerPath)
d.taskEnv.SetSecretsDir(allocdir.TaskSecretsContainerPath)
config := &docker.Config{
Image: driverConfig.ImageName,

1
client/driver/executor/executor_linux.go
View File

@@ -240,6 +240,7 @@ func (e *UniversalExecutor) configureChroot() error {
e.ctx.TaskEnv.
SetAllocDir(filepath.Join("/", allocdir.SharedAllocName)).
SetTaskLocalDir(filepath.Join("/", allocdir.TaskLocal)).
SetSecretsDir(filepath.Join("/", allocdir.TaskSecrets)).
Build()
if e.cmd.SysProcAttr == nil {