docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2662 from dotcloud/do_not_cleanup_start_if_running 

on docker start, do not cleanup if already running
This commit is contained in:
Victor Vieux 2013-11-12 11:02:10 -08:00
parent 637850063c bc6d872841
commit 71c05bb87c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
container.go
View File

@ -702,15 +702,14 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
func (container *Container) Start() (err error) { func (container *Container) Start() (err error) {
container.State.Lock() container.State.Lock()
defer container.State.Unlock() defer container.State.Unlock()
if container.State.Running {
return fmt.Errorf("The container %s is already running.", container.ID)
}
defer func() { defer func() {
if err != nil { if err != nil {
container.cleanup() container.cleanup()
} }
}() }()
if container.State.Running {
return fmt.Errorf("The container %s is already running.", container.ID)
}
if err := container.EnsureMounted(); err != nil { if err := container.EnsureMounted(); err != nil {
return err return err
} }