From a6e6cffaed2a5b6b96210b607f805adbee2fa68a Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Thu, 15 Jun 2017 11:21:05 -0700 Subject: [PATCH] executor: Use a TemplatedDependencyGetter to support template expansion Signed-off-by: Aaron Lehmann Upstream-commit: 56da5fd7d31c9a627fc6a3c482cb0bf0ffb2d26e Component: engine --- .../engine/daemon/cluster/executor/container/executor.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/engine/daemon/cluster/executor/container/executor.go b/components/engine/daemon/cluster/executor/container/executor.go index 48ec7e0d25..2c4f619cf0 100644 --- a/components/engine/daemon/cluster/executor/container/executor.go +++ b/components/engine/daemon/cluster/executor/container/executor.go @@ -19,6 +19,7 @@ import ( "github.com/docker/swarmkit/agent/exec" "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/api/naming" + "github.com/docker/swarmkit/template" "github.com/sirupsen/logrus" "golang.org/x/net/context" ) @@ -191,7 +192,7 @@ func (e *executor) Configure(ctx context.Context, node *api.Node) error { // Controller returns a docker container runner. func (e *executor) Controller(t *api.Task) (exec.Controller, error) { - dependencyGetter := agent.Restrict(e.dependencies, t) + dependencyGetter := template.NewTemplatedDependencyGetter(agent.Restrict(e.dependencies, t), t, nil) // Get the node description from the executor field e.mutex.Lock()