|
@@ -194,14 +194,6 @@ func (daemon *Daemon) register(container *Container, updateSuffixarray bool) err
|
|
|
// we'll waste time if we update it for every container
|
|
|
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() {
|
|
|
logrus.Debugf("killing old running container %s", container.ID)
|
|
|
// 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
|
|
|
}
|
|
|
|