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

Merge pull request #12269 from kostickm/12251-remove-not-empty-check

Browse Source 
Remove container name not empty check
This commit is contained in:
Phil Estes
2015-04-14 17:55:13 -04:00
parent ee54723485 98f857772f
commit 5395cdcae5
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/server/server.go
+4 -8
View File
@@ -466,10 +466,6 @@ func getContainersChanges(eng *engine.Engine, version version.Version, w http.Re
}
name := vars["name"]
if name == "" {
return fmt.Errorf("Container name cannot be empty")
}
d := getDaemon(eng)
cont, err := d.Get(name)
if err != nil {
@@ -883,10 +879,6 @@ func deleteContainers(eng *engine.Engine, version version.Version, w http.Respon
}
name := vars["name"]
if name == "" {
return fmt.Errorf("Container name cannot be empty")
}
d := getDaemon(eng)
config := &daemon.ContainerRmConfig{
ForceRemove: toBool(r.Form.Get("force")),
@@ -895,6 +887,10 @@ func deleteContainers(eng *engine.Engine, version version.Version, w http.Respon
}
if err := d.ContainerRm(name, config); err != nil {
// Force a 404 for the empty string
if strings.Contains(strings.ToLower(err.Error()), "prefix can't be empty") {
return fmt.Errorf("no such id: \"\"")
}
return err
}