kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

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

Browse source 
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
This commit is contained in:
Trevor Pounds 2015-11-16 14:45:08 -08:00
parent a3065fa48f
commit a25988cf76
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

@ -3429,7 +3429,7 @@ func (s *DockerSuite) TestRunContainerNetModeWithExposePort(c *check.C) {
} }
out, _, err = dockerCmdWithError("run", "--expose", "5000", "--net=container:parent", "busybox") 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") 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 conflict between the pulbish options and the network mode
ErrConflictNetworkPublishPorts = fmt.Errorf("Conflicting options: -p, -P, --publish-all, --publish and the network mode (--net)") 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 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, // Parse parses the specified args for the specified command and generates a Config,