starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-08-31 18:14:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
Upstream-commit: a25988cf760b96c855b3e1442547ea9d763c7cd1
Component: engine
This commit is contained in:
Trevor Pounds
2015-11-16 22:01:20 -08:00
parent cbf9321ca8
commit b68e94a11d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_run_test.go
+1 -1
View File
@@ -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")
}
}
components/engine/runconfig/parse.go
+1 -1
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,