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

Merge pull request #29565 from yuexiao-wang/fix-typo-tls 

Change tls to TLS
This commit is contained in:
Vincent Demeester 2016-12-22 12:10:09 +01:00 committed by GitHub
parent 9b17b8ea18 1e7c22c80a
commit 8cc02f31eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flags/common.go
View File

@ -21,7 +21,7 @@ const (
DefaultKeyFile = "key.pem" DefaultKeyFile = "key.pem"
// DefaultCertFile is the default filename for the cert pem file // DefaultCertFile is the default filename for the cert pem file
DefaultCertFile = "cert.pem" DefaultCertFile = "cert.pem"
// FlagTLSVerify is the flag name for the tls verification option // FlagTLSVerify is the flag name for the TLS verification option
FlagTLSVerify = "tlsverify" FlagTLSVerify = "tlsverify"
) )
@ -73,7 +73,7 @@ func (commonOpts *CommonOptions) InstallFlags(flags *pflag.FlagSet) {
// complete // complete
func (commonOpts *CommonOptions) SetDefaultOptions(flags *pflag.FlagSet) { func (commonOpts *CommonOptions) SetDefaultOptions(flags *pflag.FlagSet) {
// Regardless of whether the user sets it to true or false, if they // Regardless of whether the user sets it to true or false, if they
// specify --tlsverify at all then we need to turn on tls // specify --tlsverify at all then we need to turn on TLS
// TLSVerify can be true even if not set due to DOCKER_TLS_VERIFY env var, so we need // TLSVerify can be true even if not set due to DOCKER_TLS_VERIFY env var, so we need
// to check that here as well // to check that here as well
if flags.Changed(FlagTLSVerify) || commonOpts.TLSVerify { if flags.Changed(FlagTLSVerify) || commonOpts.TLSVerify {