diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 6e0b819df7324e3914e8d7cd33a1e1f20137cce4..2c4289555edfdb69fe8fa54af43084fc03afd328 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/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/runconfig/parse.go b/runconfig/parse.go index d87349ec0cb370e216cf2c6e515b9ea3124493d4..a5149540670517d3284c25864806a25b074f2c97 100644 --- a/runconfig/parse.go +++ b/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,