[carry 317] Cli change to pass driver specific options to docker run #1767
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ import ( | |
| networktypes "github.com/docker/docker/api/types/network" | ||
| "github.com/docker/docker/api/types/strslice" | ||
| "github.com/docker/docker/api/types/versions" | ||
| "github.com/docker/docker/errdefs" | ||
| "github.com/docker/docker/pkg/signal" | ||
| "github.com/docker/go-connections/nat" | ||
| "github.com/pkg/errors" | ||
|
|
@@ -97,7 +98,7 @@ type containerOptions struct { | |
| ioMaxBandwidth opts.MemBytes | ||
| ioMaxIOps uint64 | ||
| swappiness int64 | ||
| netMode opts.NetworkOpt | ||
| macAddress string | ||
| ipv4Address string | ||
| ipv6Address string | ||
|
|
@@ -215,8 +216,8 @@ func addFlags(flags *pflag.FlagSet) *containerOptions { | |
| flags.VarP(&copts.publish, "publish", "p", "Publish a container's port(s) to the host") | ||
| flags.BoolVarP(&copts.publishAll, "publish-all", "P", false, "Publish all exposed ports to random ports") | ||
| // We allow for both "--net" and "--network", although the latter is the recommended way. | ||
| flags.Var(&copts.netMode, "net", "Connect a container to a network") | ||
| flags.Var(&copts.netMode, "network", "Connect a container to a network") | ||
| flags.MarkHidden("net") | ||
| // We allow for both "--net-alias" and "--network-alias", although the latter is the recommended way. | ||
| flags.Var(&copts.aliases, "net-alias", "Add network-scoped alias for the container") | ||
|
|
@@ -613,8 +614,8 @@ func parse(flags *pflag.FlagSet, copts *containerOptions, serverOS string) (*con | |
| DNSOptions: copts.dnsOptions.GetAllOrEmpty(), | ||
| ExtraHosts: copts.extraHosts.GetAll(), | ||
| VolumesFrom: copts.volumesFrom.GetAll(), | ||
| IpcMode: container.IpcMode(copts.ipcMode), | ||
| NetworkMode: container.NetworkMode(copts.netMode.NetworkMode()), | ||
| PidMode: pidMode, | ||
| UTSMode: utsMode, | ||
| UsernsMode: usernsMode, | ||
|
|
@@ -654,46 +655,122 @@ func parse(flags *pflag.FlagSet, copts *containerOptions, serverOS string) (*con | |
| EndpointsConfig: make(map[string]*networktypes.EndpointSettings), | ||
| } | ||
|
|
||
| networkingConfig.EndpointsConfig, err = parseNetworkOpts(copts) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &containerConfig{ | ||
| Config: config, | ||
| HostConfig: hostConfig, | ||
| NetworkingConfig: networkingConfig, | ||
| }, nil | ||
| } | ||
|
|
||
| // parseNetworkOpts converts --network advanced options to endpoint-specs, and combines | ||
| // them with the old --network-alias and --links. If returns an error if conflicting options | ||
| // are found. | ||
| // | ||
| // this function may return _multiple_ endpoints, which is not currently supported | ||
| // by the daemon, but may be in future; it's up to the daemon to produce an error | ||
| // in case that is not supported. | ||
| func parseNetworkOpts(copts *containerOptions) (map[string]*networktypes.EndpointSettings, error) { | ||
| var ( | ||
| endpoints = make(map[string]*networktypes.EndpointSettings, len(copts.netMode.Value())) | ||
| hasUserDefined, hasNonUserDefined bool | ||
| ) | ||
|
|
||
| for i, n := range copts.netMode.Value() { | ||
| if container.NetworkMode(n.Target).IsUserDefined() { | ||
| hasUserDefined = true | ||
| } else { | ||
| hasNonUserDefined = true | ||
| } | ||
| if i == 0 { | ||
| // The first network corresponds with what was previously the "only" | ||
| // network, and what would be used when using the non-advanced syntax | ||
| // `--network-alias`, `--link`, `--ip`, `--ip6`, and `--link-local-ip` | ||
| // are set on this network, to preserve backward compatibility with | ||
| // the non-advanced notation | ||
| if err := applyContainerOptions(&n, copts); err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| ep, err := parseNetworkAttachmentOpt(n) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if _, ok := endpoints[n.Target]; ok { | ||
| return nil, errdefs.InvalidParameter(errors.Errorf("network %q is specified multiple times", n.Target)) | ||
|
Collaborator
There was a problem hiding this comment. Any particular reason this was added?
Collaborator
There was a problem hiding this comment. Opened moby/moby#42163 to discuss removing the test case that this validation breaks. |
||
| } | ||
| endpoints[n.Target] = ep | ||
| } | ||
| if hasUserDefined && hasNonUserDefined { | ||
| return nil, errdefs.InvalidParameter(errors.New("conflicting options: cannot attach both user-defined and non-user-defined network-modes")) | ||
| } | ||
| return endpoints, nil | ||
| } | ||
|
|
||
| func applyContainerOptions(n *opts.NetworkAttachmentOpts, copts *containerOptions) error { | ||
| // TODO should copts.MacAddress actually be set on the first network? (currently it's not) | ||
| // TODO should we error if _any_ advanced option is used? (i.e. forbid to combine advanced notation with the "old" flags (`--network-alias`, `--link`, `--ip`, `--ip6`)? | ||
| if len(n.Aliases) > 0 && copts.aliases.Len() > 0 { | ||
| return errdefs.InvalidParameter(errors.New("conflicting options: cannot specify both --network-alias and per-network alias")) | ||
| } | ||
| if len(n.Links) > 0 && copts.links.Len() > 0 { | ||
| return errdefs.InvalidParameter(errors.New("conflicting options: cannot specify both --link and per-network links")) | ||
| } | ||
| if copts.aliases.Len() > 0 { | ||
| n.Aliases = make([]string, copts.aliases.Len()) | ||
| copy(n.Aliases, copts.aliases.GetAll()) | ||
| } | ||
| if copts.links.Len() > 0 { | ||
| n.Links = make([]string, copts.links.Len()) | ||
| copy(n.Links, copts.links.GetAll()) | ||
| } | ||
|
|
||
| // TODO add IPv4/IPv6 options to the csv notation for --network, and error-out in case of conflicting options | ||
| n.IPv4Address = copts.ipv4Address | ||
| n.IPv6Address = copts.ipv6Address | ||
|
|
||
| // TODO should linkLocalIPs be added to the _first_ network only, or to _all_ networks? (should this be a per-network option as well?) | ||
| if copts.linkLocalIPs.Len() > 0 { | ||
| n.LinkLocalIPs = make([]string, copts.linkLocalIPs.Len()) | ||
| copy(n.LinkLocalIPs, copts.linkLocalIPs.GetAll()) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func parseNetworkAttachmentOpt(ep opts.NetworkAttachmentOpts) (*networktypes.EndpointSettings, error) { | ||
| if strings.TrimSpace(ep.Target) == "" { | ||
| return nil, errors.New("no name set for network") | ||
| } | ||
| if !container.NetworkMode(ep.Target).IsUserDefined() { | ||
| if len(ep.Aliases) > 0 { | ||
| return nil, errors.New("network-scoped aliases are only supported for user-defined networks") | ||
| } | ||
| if len(ep.Links) > 0 { | ||
| return nil, errors.New("links are only supported for user-defined networks") | ||
| } | ||
| } | ||
|
|
||
| epConfig := &networktypes.EndpointSettings{} | ||
| epConfig.Aliases = append(epConfig.Aliases, ep.Aliases...) | ||
| if len(ep.DriverOpts) > 0 { | ||
| epConfig.DriverOpts = make(map[string]string) | ||
| epConfig.DriverOpts = ep.DriverOpts | ||
| } | ||
| if len(ep.Links) > 0 { | ||
| epConfig.Links = ep.Links | ||
| } | ||
| if ep.IPv4Address != "" || ep.IPv6Address != "" || len(ep.LinkLocalIPs) > 0 { | ||
| epConfig.IPAMConfig = &networktypes.EndpointIPAMConfig{ | ||
| IPv4Address: ep.IPv4Address, | ||
| IPv6Address: ep.IPv6Address, | ||
| LinkLocalIPs: ep.LinkLocalIPs, | ||
| } | ||
| } | ||
| return epConfig, nil | ||
| } | ||
|
|
||
| func parsePortOpts(publishOpts []string) ([]string, error) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.