Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #221 from dnephin/fix-lint-errors 

Fix lint errors merged while new lint branch was in PR
This commit is contained in:
Vincent Demeester 2017-06-23 09:54:12 +02:00 committed by GitHub
parent ca8e991469 b84e21cd05
commit 0c6b8d717d
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/command/service/opts.go
View File

@ -354,7 +354,11 @@ func convertNetworks(ctx context.Context, apiClient client.NetworkAPIClient, net
if err != nil { if err != nil {
return nil, err return nil, err
} }
netAttach = append(netAttach, swarm.NetworkAttachmentConfig(net)) netAttach = append(netAttach, swarm.NetworkAttachmentConfig{ // nolint: gosimple
Target: net.Target,
Aliases: net.Aliases,
DriverOpts: net.DriverOpts,
})
} }
sort.Sort(byNetworkTarget(netAttach)) sort.Sort(byNetworkTarget(netAttach))
return netAttach, nil return netAttach, nil

5
cli/command/service/update.go
View File

@ -503,9 +503,8 @@ func updatePlacementPreferences(flags *pflag.FlagSet, placement *swarm.Placement
} }
if flags.Changed(flagPlacementPrefAdd) { if flags.Changed(flagPlacementPrefAdd) {
for _, addition := range flags.Lookup(flagPlacementPrefAdd).Value.(*placementPrefOpts).prefs { newPrefs = append(newPrefs,
newPrefs = append(newPrefs, addition) flags.Lookup(flagPlacementPrefAdd).Value.(*placementPrefOpts).prefs...)
}
} }
placement.Preferences = newPrefs placement.Preferences = newPrefs

2
cli/config/configfile/file.go
View File

@ -173,7 +173,7 @@ func (configFile *ConfigFile) ParseProxyConfig(host string, runOpts []string) ma
cfgKey = host cfgKey = host
} }
config, _ := configFile.Proxies[cfgKey] config := configFile.Proxies[cfgKey]
permitted := map[string]*string{ permitted := map[string]*string{
"HTTP_PROXY": &config.HTTPProxy, "HTTP_PROXY": &config.HTTPProxy,
"HTTPS_PROXY": &config.HTTPSProxy, "HTTPS_PROXY": &config.HTTPSProxy,