clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 21:51:33 +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/client/diff.go
+4
View File
@@ -21,6 +21,10 @@ func (cli *DockerCli) CmdDiff(args ...string) error {
cmd.Require(flag.Exact, 1)
cmd.ParseFlags(args, true)
if cmd.Arg(0) == "" {
return fmt.Errorf("Container name cannot be empty")
}
rdr, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/changes", nil, nil)
if err != nil {
return err
api/client/rm.go
+4
View File
@@ -30,6 +30,10 @@ func (cli *DockerCli) CmdRm(args ...string) error {
var encounteredError error
for _, name := range cmd.Args() {
if name == "" {
return fmt.Errorf("Container name cannot be empty")
}
_, _, err := readBody(cli.call("DELETE", "/containers/"+name+"?"+val.Encode(), nil, nil))
if err != nil {
fmt.Fprintf(cli.err, "%s\n", err)