From d7673670fc1b0e1ea8b5d521e536f87084705caf Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Tue, 18 Oct 2016 15:57:12 -0700 Subject: [PATCH 1/2] Actually mount the local directory --- client/driver/docker.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/driver/docker.go b/client/driver/docker.go index f28808799290..ffc05fe7e6bc 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -381,10 +381,12 @@ func (d *DockerDriver) containerBinds(driverConfig *DockerDriverConfig, alloc *a task *structs.Task) ([]string, error) { shared := alloc.SharedDir - local, ok := alloc.TaskDirs[task.Name] + taskDir, ok := alloc.TaskDirs[task.Name] if !ok { return nil, fmt.Errorf("Failed to find task local directory: %v", task.Name) } + local := filepath.Join(taskDir, allocdir.TaskLocal) + secret, err := alloc.GetSecretDir(task.Name) if err != nil { return nil, err From 42358a909b29afe9370d642c3fcfdbdc8cf607fe Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Tue, 18 Oct 2016 15:58:25 -0700 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d24be0dc4c9..340db4ded261 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ BUG FIXES: leader [GH-1656] * discovery: Fix client flapping when server is in a different datacenter as the client [GH-1641] + * driver/docker: Fix `local/` directory mount into container [GH-1830] ## 0.4.1 (August 18, 2016)