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

Merge pull request #4916 from creack/no_error_start_twice

Browse source 
Don't error when trying to start a running container
This commit is contained in:
Michael Crosby 2014-04-01 10:45:31 -07:00
commit 249a5ddfeb
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
api/client/commands.go
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.")

4
integration/container_test.go
View file

@ -350,7 +350,7 @@ func TestStart(t *testing.T) {
if !container.State.IsRunning() {
t.Errorf("Container should be running")
}
if err := container.Start(); err == nil {
if err := container.Start(); err != nil {
t.Fatalf("A running container should be able to be started")
}
@ -385,7 +385,7 @@ func TestCpuShares(t *testing.T) {
if !container.State.IsRunning() {
t.Errorf("Container should be running")
}
if err := container.Start(); err == nil {
if err := container.Start(); err != nil {
t.Fatalf("A running container should be able to be started")
}

2
runtime/container.go
View file

@ -426,7 +426,7 @@ func (container *Container) Start() (err error) {
defer container.Unlock()
if container.State.IsRunning() {
return fmt.Errorf("The container %s is already running.", container.ID)
return nil
}
defer func() {

8
server/server.go
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)