beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update executor fixes from swarmkit

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2016-08-09 11:50:20 -07:00 committed by Yong Tang
parent 50566148ca
commit 82cbb15ff4
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
daemon/cluster/executor/container/container.go
View file

@ -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 {

2
daemon/cluster/executor/container/controller.go
View file

@ -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 {