clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-04 12:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a panic when the exec fails to start

Browse Source 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
This commit is contained in:
Shijiang Wei
2015-08-22 00:01:44 +08:00
parent 5ceff3f191
commit fcf9daad91
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/server/exec.go
+4 -2
View File
@@ -65,7 +65,7 @@ func (s *Server) postContainerExecStart(version version.Version, w http.Response
}
var (
execName = vars["name"]
stdin io.ReadCloser
stdin, inStream io.ReadCloser
stdout, stderr, outStream io.Writer
)
@@ -77,7 +77,7 @@ func (s *Server) postContainerExecStart(version version.Version, w http.Response
if !execStartCheck.Detach {
var err error
// Setting up the streaming http interface.
inStream, outStream, err := hijackServer(w)
inStream, outStream, err = hijackServer(w)
if err != nil {
return err
}
@@ -95,6 +95,8 @@ func (s *Server) postContainerExecStart(version version.Version, w http.Response
stderr = stdcopy.NewStdWriter(outStream, stdcopy.Stderr)
stdout = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
}
} else {
outStream = w
}
// Now run the user process in container.