From b68e94a11df44eda2705d9cbe39e82352d0accd2 Mon Sep 17 00:00:00 2001 From: Trevor Pounds Date: Mon, 16 Nov 2015 14:45:08 -0800 Subject: [PATCH] Fix typo when --expose and --net are specified. Signed-off-by: Trevor Pounds Upstream-commit: a25988cf760b96c855b3e1442547ea9d763c7cd1 Component: engine --- components/engine/integration-cli/docker_cli_run_test.go | 2 +- components/engine/runconfig/parse.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_run_test.go b/components/engine/integration-cli/docker_cli_run_test.go index 6e0b819df7..2c4289555e 100644 --- a/components/engine/integration-cli/docker_cli_run_test.go +++ b/components/engine/integration-cli/docker_cli_run_test.go @@ -3429,7 +3429,7 @@ func (s *DockerSuite) TestRunContainerNetModeWithExposePort(c *check.C) { } out, _, err = dockerCmdWithError("run", "--expose", "5000", "--net=container:parent", "busybox") - if err == nil || !strings.Contains(out, "Conflicting options: --expose and the network mode (--expose)") { + if err == nil || !strings.Contains(out, "Conflicting options: --expose and the network mode (--net)") { c.Fatalf("run --net=container with --expose should error out") } } diff --git a/components/engine/runconfig/parse.go b/components/engine/runconfig/parse.go index d87349ec0c..a514954067 100644 --- a/components/engine/runconfig/parse.go +++ b/components/engine/runconfig/parse.go @@ -39,7 +39,7 @@ var ( // ErrConflictNetworkPublishPorts conflict between the pulbish options and the network mode ErrConflictNetworkPublishPorts = fmt.Errorf("Conflicting options: -p, -P, --publish-all, --publish and the network mode (--net)") // ErrConflictNetworkExposePorts conflict between the expose option and the network mode - ErrConflictNetworkExposePorts = fmt.Errorf("Conflicting options: --expose and the network mode (--expose)") + ErrConflictNetworkExposePorts = fmt.Errorf("Conflicting options: --expose and the network mode (--net)") ) // Parse parses the specified args for the specified command and generates a Config,