kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix docker daemon start with old running container which user volume plugin. Fixes #15720

Browse source 
Signed-off-by: Lei Jitang <leijitang@huawei>
This commit is contained in:
Lei Jitang 2015-08-21 11:29:53 +08:00
parent d760947b2e
commit c8a46cb0b2
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
daemon/daemon.go
View file

@ -194,14 +194,6 @@ func (daemon *Daemon) register(container *Container, updateSuffixarray bool) err
// we'll waste time if we update it for every container // we'll waste time if we update it for every container
daemon.idIndex.Add(container.ID) daemon.idIndex.Add(container.ID)
if err := daemon.verifyVolumesInfo(container); err != nil {
return err
}
if err := container.prepareMountPoints(); err != nil {
return err
}
if container.IsRunning() { if container.IsRunning() {
logrus.Debugf("killing old running container %s", container.ID) logrus.Debugf("killing old running container %s", container.ID)
// Set exit code to 128 + SIGKILL (9) to properly represent unsuccessful exit // Set exit code to 128 + SIGKILL (9) to properly represent unsuccessful exit
@ -221,6 +213,14 @@ func (daemon *Daemon) register(container *Container, updateSuffixarray bool) err
} }
} }
if err := daemon.verifyVolumesInfo(container); err != nil {
return err
}
if err := container.prepareMountPoints(); err != nil {
return err
}
return nil return nil
} }