Update executor fixes from swarmkit

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 82cbb15ff4e8d6472faa3201149b2478a94e2f0f
Component: engine
This commit is contained in:
Tonis Tiigi
2016-08-10 17:54:00 -07:00
committed by Yong Tang
parent c2c1de1f8a
commit 6b8a90e881
2 changed files with 2 additions and 1 deletions
@@ -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 {
@@ -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 {