Browse code

Fix typo when --expose and --net are specified.

Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>

Trevor Pounds authored on 2015/11/17 07:45:08
Showing 2 changed files
... ...
@@ -3429,7 +3429,7 @@ func (s *DockerSuite) TestRunContainerNetModeWithExposePort(c *check.C) {
3429 3429
 	}
3430 3430
 
3431 3431
 	out, _, err = dockerCmdWithError("run", "--expose", "5000", "--net=container:parent", "busybox")
3432
-	if err == nil || !strings.Contains(out, "Conflicting options: --expose and the network mode (--expose)") {
3432
+	if err == nil || !strings.Contains(out, "Conflicting options: --expose and the network mode (--net)") {
3433 3433
 		c.Fatalf("run --net=container with --expose should error out")
3434 3434
 	}
3435 3435
 }
... ...
@@ -39,7 +39,7 @@ var (
39 39
 	// ErrConflictNetworkPublishPorts conflict between the pulbish options and the network mode
40 40
 	ErrConflictNetworkPublishPorts = fmt.Errorf("Conflicting options: -p, -P, --publish-all, --publish and the network mode (--net)")
41 41
 	// ErrConflictNetworkExposePorts conflict between the expose option and the network mode
42
-	ErrConflictNetworkExposePorts = fmt.Errorf("Conflicting options: --expose and the network mode (--expose)")
42
+	ErrConflictNetworkExposePorts = fmt.Errorf("Conflicting options: --expose and the network mode (--net)")
43 43
 )
44 44
 
45 45
 // Parse parses the specified args for the specified command and generates a Config,