From 779e1b97127b4cf1a216c2136a9bb8dc6f470c9b Mon Sep 17 00:00:00 2001 From: Michael Wan Date: Wed, 23 May 2018 11:10:17 -0400 Subject: [PATCH] bugfix: panic when execute exec command with flag -d Signed-off-by: Michael Wan --- daemon/mgr/container.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/mgr/container.go b/daemon/mgr/container.go index 053da0c39..421003a1f 100644 --- a/daemon/mgr/container.go +++ b/daemon/mgr/container.go @@ -1528,12 +1528,12 @@ func (mgr *ContainerManager) openExecIO(id string, attach *AttachConfig) (*conta options := []func(*containerio.Option){ containerio.WithID(id), - containerio.WithStdin(attach.Stdin), - containerio.WithMuxDisabled(attach.MuxDisabled), } if attach != nil { options = append(options, attachConfigToOptions(attach)...) + options = append(options, containerio.WithStdin(attach.Stdin)) + options = append(options, containerio.WithMuxDisabled(attach.MuxDisabled)) } else { options = append(options, containerio.WithDiscard()) } @@ -1551,11 +1551,11 @@ func (mgr *ContainerManager) openAttachIO(id string, attach *AttachConfig) (*con containerio.WithID(id), containerio.WithRootDir(rootDir), containerio.WithJSONFile(), - containerio.WithStdin(attach.Stdin), } if attach != nil { options = append(options, attachConfigToOptions(attach)...) + options = append(options, containerio.WithStdin(attach.Stdin)) } else { options = append(options, containerio.WithDiscard()) }