clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 21:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Assign id as name when all else fails

Browse Source
This commit is contained in:
Michael Crosby
2013-10-30 18:31:18 -07:00
parent 5eb472025a
commit 8227ea35cf
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime.go
+8 -2
View File
@@ -265,7 +265,10 @@ 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 := generateRandomName(runtime)
name, err := generateRandomName(runtime)
if err != nil {
container.Name = container.ShortID()
}
container.Name = name
if _, err := runtime.containerGraph.Set(name, container.ID); err != nil {
@@ -356,7 +359,10 @@ func (runtime *Runtime) Create(config *Config, name string) (*Container, []strin
id := GenerateID()
if name == "" {
name = generateRandomName(runtime)
name, err = generateRandomName(runtime)
if err != nil {
name = utils.TruncateID(id)
}
}
if name[0] != '/' {
name = "/" + name