From bc0cdc0a4c1c83abcf1d8500e8a39f67183963ae Mon Sep 17 00:00:00 2001
From: willhf <willhf@gmail.com>
Date: Sun, 5 Apr 2015 19:38:31 -0700
Subject: [PATCH] Fix incompatible flags conditional

Signed-off-by: willhf <willhf@gmail.com>
---
 runconfig/parse.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runconfig/parse.go b/runconfig/parse.go
index cf4d4003a..7ada3f632 100644
--- a/runconfig/parse.go
+++ b/runconfig/parse.go
@@ -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
 	}