kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Fix incompatible flags conditional 

Signed-off-by: willhf <willhf@gmail.com>
This commit is contained in:
willhf 2015-04-05 19:38:31 -07:00
parent 6dba2d01b5
commit bc0cdc0a4c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runconfig/parse.go
View File

@ -133,7 +133,7 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe
return nil, nil, cmd, ErrConflictHostNetworkAndDns
}
if *flNetMode == "container" && flDns.Len() > 0 {
if strings.HasPrefix(*flNetMode, "container") && flDns.Len() > 0 {
return nil, nil, cmd, ErrConflictContainerNetworkAndDns
}