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

Merge pull request #27942 from yuexiao-wang/remove-const 

Remove some redundant consts
This commit is contained in:
Sebastiaan van Stijn 2016-11-01 20:43:50 -07:00 committed by GitHub
parent 63719e1a24 3acdab83fb
commit d4f4ad0ee4
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
command/swarm/init.go
View File

@ -14,13 +14,6 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
) )
const (
generatedSecretEntropyBytes = 16
generatedSecretBase = 36
// floor(log(2^128-1, 36)) + 1
maxGeneratedSecretLength = 25
)
type initOptions struct { type initOptions struct {
swarmOptions swarmOptions
listenAddr NodeAddrOption listenAddr NodeAddrOption
@ -46,7 +39,7 @@ func newInitCommand(dockerCli *command.DockerCli) *cobra.Command {
flags := cmd.Flags() flags := cmd.Flags()
flags.Var(&opts.listenAddr, flagListenAddr, "Listen address (format: <ip|interface>[:port])") flags.Var(&opts.listenAddr, flagListenAddr, "Listen address (format: <ip|interface>[:port])")
flags.StringVar(&opts.advertiseAddr, flagAdvertiseAddr, "", "Advertised address (format: <ip|interface>[:port])") flags.StringVar(&opts.advertiseAddr, flagAdvertiseAddr, "", "Advertised address (format: <ip|interface>[:port])")
flags.BoolVar(&opts.forceNewCluster, "force-new-cluster", false, "Force create a new cluster from current state.") flags.BoolVar(&opts.forceNewCluster, "force-new-cluster", false, "Force create a new cluster from current state")
addSwarmFlags(flags, &opts.swarmOptions) addSwarmFlags(flags, &opts.swarmOptions)
return cmd return cmd
} }

2
command/swarm/opts.go
View File

@ -33,7 +33,7 @@ type swarmOptions struct {
externalCA ExternalCAOption externalCA ExternalCAOption
} }
// NodeAddrOption is a pflag.Value for listen and remote addresses // NodeAddrOption is a pflag.Value for listening addresses
type NodeAddrOption struct { type NodeAddrOption struct {
addr string addr string
} }