docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity

Merge pull request #2904 from SvenDowideit/dont-show-user-internal-slash-in-error-message

Browse Source 
there appears to be a slash prepended to a container name internally
Upstream-commit: f75dc36204b37d9cb292fd3cf949e1cec1142c36
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-11-27 09:58:24 -08:00
parent d6d10d16ca f43b960fe1
commit 92016b6859
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/runtime.go
View File

@@ -422,7 +422,8 @@ func (runtime *Runtime) Create(config *Config, name string) (*Container, []strin
if _, err := runtime.containerGraph.Set(name, id); err != nil {
if strings.HasSuffix(err.Error(), "name are not unique") {
conflictingContainer, _ := runtime.GetByName(name)
return nil, nil, fmt.Errorf("Conflict, The name %s is already assigned to %s. You have to delete (or rename) that container to be able to assign %s to a container again.", name, utils.TruncateID(conflictingContainer.ID), name)
nameAsKnownByUser := strings.TrimPrefix(name, "/")
return nil, nil, fmt.Errorf("Conflict, The name %s is already assigned to %s. You have to delete (or rename) that container to be able to assign %s to a container again.", nameAsKnownByUser, utils.TruncateID(conflictingContainer.ID), nameAsKnownByUser)
}
return nil, nil, err
}