Merge pull request #10421 from noironetworks/10388-Specifying_confliting_options

Specifying -a and -d to docker run should throw an error
This commit is contained in:
Michael Crosby
2015-02-06 14:58:08 -08:00
2 changed files with 18 additions and 1 deletions
+1 -1
View File
@@ -2235,7 +2235,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
return err
}
} else {
if fl := cmd.Lookup("attach"); fl != nil {
if fl := cmd.Lookup("-attach"); fl != nil {
flAttach = fl.Value.(*opts.ListOpts)
if flAttach.Len() != 0 {
return ErrConflictAttachDetach