From 28fcc3f1f9e5c0acc055e772370330e83dd775cb Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 9 Aug 2016 11:50:20 -0700 Subject: [PATCH] Update executor fixes from swarmkit Signed-off-by: Tonis Tiigi Upstream-commit: 5673c53417d689704ca7b5715f5c4d549fdf710c Component: engine --- .../engine/daemon/cluster/executor/container/container.go | 1 + .../engine/daemon/cluster/executor/container/controller.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/engine/daemon/cluster/executor/container/container.go b/components/engine/daemon/cluster/executor/container/container.go index 19e23558ec..78bedb998e 100644 --- a/components/engine/daemon/cluster/executor/container/container.go +++ b/components/engine/daemon/cluster/executor/container/container.go @@ -276,6 +276,7 @@ func (c *containerConfig) hostConfig() *enginecontainer.HostConfig { Resources: c.resources(), Binds: c.binds(), Tmpfs: c.tmpfs(), + GroupAdd: c.spec().Groups, } if c.task.LogDriver != nil { diff --git a/components/engine/daemon/cluster/executor/container/controller.go b/components/engine/daemon/cluster/executor/container/controller.go index 5f865aae4c..11e8059118 100644 --- a/components/engine/daemon/cluster/executor/container/controller.go +++ b/components/engine/daemon/cluster/executor/container/controller.go @@ -33,7 +33,7 @@ type controller struct { var _ exec.Controller = &controller{} -// NewController returns a dockerexec runner for the provided task. +// NewController returns a docker exec runner for the provided task. func newController(b executorpkg.Backend, task *api.Task) (*controller, error) { adapter, err := newContainerAdapter(b, task) if err != nil {