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

Minor cleanup

Browse Source 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: cff5f0357ea35245ac906a0326863ac1f8c47c61
Component: engine
This commit is contained in:
Guillaume J. Charmes
2014-04-01 10:27:05 -07:00
parent e4f0a4813f
commit 9f401b129b
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/api/client/commands.go
+9 -5
View File
@@ -549,9 +549,11 @@ func (cli *DockerCli) forwardAllSignals(cid string) chan os.Signal {
}
func (cli *DockerCli) CmdStart(args ...string) error {
cmd := cli.Subcmd("start", "CONTAINER [CONTAINER...]", "Restart a stopped container")
attach := cmd.Bool([]string{"a", "-attach"}, false, "Attach container's stdout/stderr and forward all signals to the process")
openStdin := cmd.Bool([]string{"i", "-interactive"}, false, "Attach container's stdin")
var (
cmd = cli.Subcmd("start", "CONTAINER [CONTAINER...]", "Restart a stopped container")
attach = cmd.Bool([]string{"a", "-attach"}, false, "Attach container's stdout/stderr and forward all signals to the process")
openStdin = cmd.Bool([]string{"i", "-interactive"}, false, "Attach container's stdin")
)
if err := cmd.Parse(args); err != nil {
return nil
}
@@ -560,8 +562,10 @@ func (cli *DockerCli) CmdStart(args ...string) error {
return nil
}
var cErr chan error
var tty bool
var (
cErr chan error
tty bool
)
if *attach || *openStdin {
if cmd.NArg() > 1 {
return fmt.Errorf("You cannot start and attach multiple containers at once.")
components/engine/server/server.go
+5 -3
View File
@@ -2064,9 +2064,11 @@ func (srv *Server) ContainerStart(job *engine.Job) engine.Status {
if len(job.Args) < 1 {
return job.Errorf("Usage: %s container_id", job.Name)
}
name := job.Args[0]
runtime := srv.runtime
container := runtime.Get(name)
var (
name = job.Args[0]
runtime = srv.runtime
container = runtime.Get(name)
)
if container == nil {
return job.Errorf("No such container: %s", name)