浏览代码

Update executor fixes from swarmkit

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Tonis Tiigi 9 年之前
父节点
当前提交
5673c53417
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 0
      daemon/cluster/executor/container/container.go
  2. 1 1
      daemon/cluster/executor/container/controller.go

+ 1 - 0
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 {

+ 1 - 1
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 {