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

Merge pull request #2591 from dotcloud/fix_Assign_id_as_name_when_all_else_fails

Browse Source 
Fix Assign id as name when all else fails
Upstream-commit: 132db329d479c1d8712117534798810df8c1b8ec
Component: engine
This commit is contained in:
Michael Crosby
2013-11-07 12:29:02 -08:00
parent 61da922aa3 b5fe937fc9
commit 8d5420a376
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/runtime.go
View File

@ -286,13 +286,12 @@ func (runtime *Runtime) restore() error {
// Any containers that are left over do not exist in the graph
for _, container := range containers {
// Try to set the default name for a container if it exists prior to links
name, err := generateRandomName(runtime)
container.Name, err = generateRandomName(runtime)
if err != nil {
container.Name = container.ShortID()
}
container.Name = name
if _, err := runtime.containerGraph.Set(name, container.ID); err != nil {
if _, err := runtime.containerGraph.Set(container.Name, container.ID); err != nil {
utils.Debugf("Setting default id - %s", err)
}
register(container)