Update executor fixes from swarmkit

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tiborvass · Aug 10, 2016 · 5673c53 · 5673c53
1 parent 3b555a5
commit 5673c53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/daemon/cluster/executor/container/container.go b/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/daemon/cluster/executor/container/controller.go b/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 {