Fix error typo when --expose and --net are specified
| ... | ... |
@@ -3419,7 +3419,7 @@ func (s *DockerSuite) TestRunContainerNetModeWithExposePort(c *check.C) {
|
| 3419 | 3419 |
} |
| 3420 | 3420 |
|
| 3421 | 3421 |
out, _, err = dockerCmdWithError("run", "--expose", "5000", "--net=container:parent", "busybox")
|
| 3422 |
- if err == nil || !strings.Contains(out, "Conflicting options: --expose and the network mode (--expose)") {
|
|
| 3422 |
+ if err == nil || !strings.Contains(out, "Conflicting options: --expose and the network mode (--net)") {
|
|
| 3423 | 3423 |
c.Fatalf("run --net=container with --expose should error out")
|
| 3424 | 3424 |
} |
| 3425 | 3425 |
} |
| ... | ... |
@@ -39,7 +39,7 @@ var ( |
| 39 | 39 |
// ErrConflictNetworkPublishPorts conflict between the pulbish options and the network mode |
| 40 | 40 |
ErrConflictNetworkPublishPorts = fmt.Errorf("Conflicting options: -p, -P, --publish-all, --publish and the network mode (--net)")
|
| 41 | 41 |
// ErrConflictNetworkExposePorts conflict between the expose option and the network mode |
| 42 |
- ErrConflictNetworkExposePorts = fmt.Errorf("Conflicting options: --expose and the network mode (--expose)")
|
|
| 42 |
+ ErrConflictNetworkExposePorts = fmt.Errorf("Conflicting options: --expose and the network mode (--net)")
|
|
| 43 | 43 |
) |
| 44 | 44 |
|
| 45 | 45 |
// Parse parses the specified args for the specified command and generates a Config, |