Always umount container rootfs and volumes on docker cp failed

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 13c36ce65ec02c7d2ac564ccc9d4f69e92760d9a
Component: engine
This commit is contained in:
Lei Jitang
2015-07-07 20:27:45 +08:00
parent f43c5d8e7a
commit eb7ca7510b

View File

@ -622,11 +622,12 @@ func (container *Container) Copy(resource string) (io.ReadCloser, error) {
return nil, err
}
for _, m := range mounts {
dest, err := container.GetResourcePath(m.Destination)
var dest string
dest, err = container.GetResourcePath(m.Destination)
if err != nil {
return nil, err
}
if err := mount.Mount(m.Source, dest, "bind", "rbind,ro"); err != nil {
if err = mount.Mount(m.Source, dest, "bind", "rbind,ro"); err != nil {
return nil, err
}
}