docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cluster: Fix name setting of pending containers. 

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2015-10-08 16:21:09 -07:00
parent 24394612f5
commit 7c0539c650
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cluster/swarm/cluster.go
View File

@ -27,13 +27,17 @@ type pendingContainer struct {
} }
func (p *pendingContainer) ToContainer() *cluster.Container { func (p *pendingContainer) ToContainer() *cluster.Container {
return &cluster.Container{ container := &cluster.Container{
Container: dockerclient.Container{ Container: dockerclient.Container{},
Names: []string{"/" + p.Name},
},
Config: p.Config, Config: p.Config,
Engine: p.Engine, Engine: p.Engine,
} }
if p.Name != "" {
container.Container.Names = []string{"/" + p.Name}
}
return container
} }
// Cluster is exported // Cluster is exported
@ -124,7 +128,7 @@ func (c *Cluster) createContainer(config *cluster.ContainerConfig, name string,
// Ensure the name is available // Ensure the name is available
if !c.checkNameUniqueness(name) { if !c.checkNameUniqueness(name) {
c.scheduler.Unlock() c.scheduler.Unlock()
return nil, fmt.Errorf("Conflict, The name %s is already assigned. You have to delete (or rename) that container to be able to assign %s to a container again.", name, name) return nil, fmt.Errorf("Conflict: The name %s is already assigned. You have to delete (or rename) that container to be able to assign %s to a container again.", name, name)
} }
// Associate a Swarm ID to the container we are creating. // Associate a Swarm ID to the container we are creating.
@ -697,7 +701,7 @@ func (c *Cluster) RenameContainer(container *cluster.Container, newName string)
// check new name whether available // check new name whether available
if !c.checkNameUniqueness(newName) { if !c.checkNameUniqueness(newName) {
return fmt.Errorf("Conflict, The name %s is already assigned. You have to delete (or rename) that container to be able to assign %s to a container again.", newName, newName) return fmt.Errorf("Conflict: The name %s is already assigned. You have to delete (or rename) that container to be able to assign %s to a container again.", newName, newName)
} }
// call engine rename // call engine rename