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

Renaming a container with an invalid name should fail

Browse Source 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: a92281637f5b629e110b5bd074566bb6c302bb62
Component: engine
This commit is contained in:
Jessica Frazelle
2015-01-14 12:54:23 -08:00
parent b769333838
commit 4fdee94024
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/rename.go
+13 -9
View File
@@ -8,23 +8,27 @@ func (daemon *Daemon) ContainerRename(job *engine.Job) engine.Status {
if len(job.Args) != 2 {
return job.Errorf("usage: %s OLD_NAME NEW_NAME", job.Name)
}
old_name := job.Args[0]
new_name := job.Args[1]
oldName := job.Args[0]
newName := job.Args[1]
container := daemon.Get(old_name)
container := daemon.Get(oldName)
if container == nil {
return job.Errorf("No such container: %s", old_name)
return job.Errorf("No such container: %s", oldName)
}
oldName = container.Name
container.Lock()
defer container.Unlock()
if err := daemon.containerGraph.Delete(container.Name); err != nil {
return job.Errorf("Failed to delete container %q: %v", old_name, err)
}
if _, err := daemon.reserveName(container.ID, new_name); err != nil {
if _, err := daemon.reserveName(container.ID, newName); err != nil {
return job.Errorf("Error when allocating new name: %s", err)
}
container.Name = new_name
container.Name = newName
if err := daemon.containerGraph.Delete(oldName); err != nil {
return job.Errorf("Failed to delete container %q: %v", oldName, err)
}
return engine.StatusOK
}