kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #37888 from lifubang/renameimprove 

oldName release too early when docker rename
This commit is contained in:
Brian Goff 2018-10-01 09:00:09 -07:00 committed by GitHub
parent deac65c929 73cf7dfe17
commit 299015de40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/rename.go
View File

@ -74,6 +74,8 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) error {
daemon.containersReplica.ReleaseName(newName + k)
}
daemon.releaseName(newName)
} else {
daemon.releaseName(oldName)
}
}()
@ -81,7 +83,6 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) error {
daemon.linkIndex.unlink(oldName+k, v, container)
daemon.containersReplica.ReleaseName(oldName + k)
}
daemon.releaseName(oldName)
if err = container.CheckpointTo(daemon.containersReplica); err != nil {
return err
}