Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/command/network/disconnect.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ func newDisconnectCommand(dockerCLI command.Cli) *cobra.Command {
if len(args) == 0 {
return completion.NetworkNames(dockerCLI)(cmd, args, toComplete)
}
network := args[0]
return completion.ContainerNames(dockerCLI, true, isConnected(network))(cmd, args, toComplete)
nw := args[0]
return completion.ContainerNames(dockerCLI, true, isConnected(nw))(cmd, args, toComplete)
},
DisableFlagsInUseLine: true,
}
Expand Down
8 changes: 4 additions & 4 deletions cli/compose/convert/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,16 +210,16 @@ func convertServiceNetworks(
}

nets := []swarm.NetworkAttachmentConfig{}
for networkName, network := range networks {
for networkName, nw := range networks {
networkConfig, ok := networkConfigs[networkName]
if !ok && networkName != defaultNetwork {
return nil, fmt.Errorf("undefined network %q", networkName)
}
var aliases []string
var driverOpts map[string]string
if network != nil {
aliases = network.Aliases
driverOpts = network.DriverOpts
if nw != nil {
aliases = nw.Aliases
driverOpts = nw.DriverOpts
}
target := namespace.Scope(networkName)
if networkConfig.Name != "" {
Expand Down
20 changes: 10 additions & 10 deletions cli/compose/loader/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -545,25 +545,25 @@ func LoadNetworks(source map[string]any, version string) (map[string]types.Netwo
if err != nil {
return networks, err
}
for name, network := range networks {
if !network.External.External {
for name, nw := range networks {
if !nw.External.External {
continue
}
switch {
case network.External.Name != "":
if network.Name != "" {
case nw.External.Name != "":
if nw.Name != "" {
return nil, fmt.Errorf("network %s: network.external.name and network.name conflict; only use network.name", name)
}
if versions.GreaterThanOrEqualTo(version, "3.5") {
logrus.Warnf("network %s: network.external.name is deprecated in favor of network.name", name)
}
network.Name = network.External.Name
network.External.Name = ""
case network.Name == "":
network.Name = name
nw.Name = nw.External.Name
nw.External.Name = ""
case nw.Name == "":
nw.Name = name
}
network.Extras = loadExtras(name, source)
networks[name] = network
nw.Extras = loadExtras(name, source)
networks[name] = nw
}
return networks, nil
}
Expand Down
Loading