From 62d142653cd26471e06cff99593dce70701588c4 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 11 Jun 2014 20:54:40 +0000 Subject: [PATCH] Allow --net=none & -h Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) Upstream-commit: f411f8bfc5d04aed6499dfc90e357c58713bc84d Component: engine --- components/engine/runconfig/parse.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/runconfig/parse.go b/components/engine/runconfig/parse.go index 0fa287adb1..acb0b41c87 100644 --- a/components/engine/runconfig/parse.go +++ b/components/engine/runconfig/parse.go @@ -18,7 +18,7 @@ var ( ErrInvalidWorkingDirectory = fmt.Errorf("The working directory is invalid. It needs to be an absolute path.") ErrConflictAttachDetach = fmt.Errorf("Conflicting options: -a and -d") ErrConflictDetachAutoRemove = fmt.Errorf("Conflicting options: --rm and -d") - ErrConflictNetworkHostname = fmt.Errorf("Conflicting options: -h and --net") + ErrConflictNetworkHostname = fmt.Errorf("Conflicting options: -h and the network mode (--net)") ) //FIXME Only used in tests @@ -104,7 +104,7 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf return nil, nil, cmd, ErrConflictDetachAutoRemove } - if *flNetMode != "bridge" && *flHostname != "" { + if *flNetMode != "bridge" && *flNetMode != "none" && *flHostname != "" { return nil, nil, cmd, ErrConflictNetworkHostname }