toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ioutil.NopCloser instead of opening /dev/null for ReadCloser in CmdRun. Related to #31

Browse Source 
Upstream-commit: 63edf8a4a1830a939432e369dd075ebade0e03a9
Component: engine
This commit is contained in:
Charles Hooper
2013-03-12 03:18:34 +00:00
parent f7b883233d
commit b4142391ec
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/server/server.go
View File

@ -11,6 +11,7 @@ import (
"github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/rcli"
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
@ -826,11 +827,8 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string)
// Find the image
img = srv.images.Find(name)
if img == nil {
devnull, err := os.Open("/dev/null")
if err != nil {
return errors.New("Error opening /dev/null")
}
if srv.CmdPull(devnull, stdout, name) != nil {
stdin_noclose := ioutil.NopCloser(stdin)
if srv.CmdPull(stdin_noclose, stdout, name) != nil {
return errors.New("Error downloading image: " + name)
}
img = srv.images.Find(name)