beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #18027 from tpounds/fix-err-message-typo

Browse source 
Fix error typo when --expose and --net are specified
This commit is contained in:
Michael Crosby 2015-11-17 11:34:40 -08:00
commit 19debeb255
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration-cli/docker_cli_run_test.go
View file

@ -3419,7 +3419,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")
}
}

2
runconfig/parse.go
View file

@ -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,