p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix name collision handling in restore

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a9c1575b1a248305290731ade24eab784ff95d55
Component: engine
This commit is contained in:
Tonis Tiigi
2016-09-29 08:35:10 -07:00
parent 3e0303bb32
commit 97b044238e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/daemon.go
View File

@ -152,13 +152,15 @@ func (daemon *Daemon) restore() error {
removeContainers := make(map[string]*container.Container)
restartContainers := make(map[*container.Container]chan struct{})
activeSandboxes := make(map[string]interface{})
for _, c := range containers {
for id, c := range containers {
if err := daemon.registerName(c); err != nil {
logrus.Errorf("Failed to register container %s: %s", c.ID, err)
delete(containers, id)
continue
}
if err := daemon.Register(c); err != nil {
logrus.Errorf("Failed to register container %s: %s", c.ID, err)
delete(containers, id)
continue
}