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

docker run -a: optionally attach to the new process. Run it in the background by default

Browse source
This commit is contained in:
Solomon Hykes 2013-01-20 22:22:51 -08:00
parent 63081c6cc8
commit e74d0b2a56
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dockerd/dockerd.go
View file

@ -4,6 +4,7 @@ import (
"errors"
"log"
"io"
"io/ioutil"
"net/http"
"net/url"
"os/exec"
@ -237,6 +238,7 @@ func (docker *Docker) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...stri
flags := Subcmd(stdout, "run", "-l LAYER [-l LAYER...] COMMAND {ARG...]", "Run a command in a container")
fl_layers := new(ArgList)
flags.Var(fl_layers, "l", "Add a layer to the filesystem. Multiple layers are added in the order they are defined")
fl_attach := flags.Bool("a", false, "Attach stdin and stdout")
if err := flags.Parse(args); err != nil {
return nil
}
@ -278,7 +280,13 @@ func (docker *Docker) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...stri
}
}
docker.containers[container.Id] = container
return container.Run(stdin, stdout)
if *fl_attach {
return container.Run(stdin, stdout)
} else {
go container.Run(ioutil.NopCloser(new(bytes.Buffer)), ioutil.Discard)
fmt.Fprintln(stdout, container.Id)
}
return nil
}
func (docker *Docker) CmdClone(stdin io.ReadCloser, stdout io.Writer, args ...string) error {