toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13502 from coolljt0725/conflict_port_and_netmode

Browse Source 
Add --net=container with --publish --expose --publish-all error out
Upstream-commit: 637023a5f8d8347a0e271c09d5c9bc84fbc97693
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2015-06-15 16:25:59 +02:00
parent 98d6dbe3a1 d1589d564f
commit f29d02bba3
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/runconfig/parse.go
+9
View File
@@ -20,6 +20,8 @@ var (
ErrConflictHostNetworkAndLinks = fmt.Errorf("Conflicting options: --net=host can't be used with links. This would result in undefined behavior")
ErrConflictContainerNetworkAndMac = fmt.Errorf("Conflicting options: --mac-address and the network mode (--net)")
ErrConflictNetworkHosts = fmt.Errorf("Conflicting options: --add-host and the network mode (--net)")
ErrConflictNetworkPublishPorts = fmt.Errorf("Conflicting options: -p, -P, --publish-all, --publish and the network mode (--net)")
ErrConflictNetworkExposePorts = fmt.Errorf("Conflicting options: --expose and the network mode (--expose)")
)
func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSet, error) {
@@ -143,6 +145,13 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe
return nil, nil, cmd, ErrConflictContainerNetworkAndMac
}
if netMode.IsContainer() && (flPublish.Len() > 0 || *flPublishAll == true) {
return nil, nil, cmd, ErrConflictNetworkPublishPorts
}
if netMode.IsContainer() && flExpose.Len() > 0 {
return nil, nil, cmd, ErrConflictNetworkExposePorts
}
// Validate the input mac address
if *flMacAddress != "" {
if _, err := opts.ValidateMACAddress(*flMacAddress); err != nil {