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

Initialize field with name

Browse source 
Signed-off-by: Ke Li <kel@splunk.com>
This commit is contained in:
Ke Li 2016-11-29 19:36:56 +08:00
parent 1ef10c83c7
commit da6944ec87
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/cluster/executor/container/container.go
View file

@ -584,7 +584,13 @@ func (c *containerConfig) networkCreateRequest(name string) (clustertypes.Networ
options.IPAM.Config = append(options.IPAM.Config, c)
}
return clustertypes.NetworkCreateRequest{na.Network.ID, types.NetworkCreateRequest{Name: name, NetworkCreate: options}}, nil
return clustertypes.NetworkCreateRequest{
ID: na.Network.ID,
NetworkCreateRequest: types.NetworkCreateRequest{
Name: name,
NetworkCreate: options,
},
}, nil
}
func (c containerConfig) eventFilter() filters.Args {

4
daemon/cluster/executor/container/executor.go
View file

@ -114,8 +114,8 @@ func (e *executor) Configure(ctx context.Context, node *api.Node) error {
}
return e.backend.SetupIngress(clustertypes.NetworkCreateRequest{
na.Network.ID,
types.NetworkCreateRequest{
ID: na.Network.ID,
NetworkCreateRequest: types.NetworkCreateRequest{
Name: na.Network.Spec.Annotations.Name,
NetworkCreate: options,
},