mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	Verify that the configuration keys in the file are valid.
- Return an error if any of the keys don't match valid flags. - Fix an issue ignoring merged values as named values. - Fix tlsverify configuration key. - Fix bug in mflag to avoid panics when one of the flag set doesn't have any flag. Signed-off-by: David Calavera <david.calavera@gmail.com>
This commit is contained in:
		
							parent
							
								
									ba01d9f9d6
								
							
						
					
					
						commit
						231eeca2b0
					
				
					 8 changed files with 142 additions and 21 deletions
				
			
		| 
						 | 
				
			
			@ -18,6 +18,7 @@ const (
 | 
			
		|||
	defaultCaFile       = "ca.pem"
 | 
			
		||||
	defaultKeyFile      = "key.pem"
 | 
			
		||||
	defaultCertFile     = "cert.pem"
 | 
			
		||||
	tlsVerifyKey        = "tlsverify"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
var (
 | 
			
		||||
| 
						 | 
				
			
			@ -60,7 +61,7 @@ func postParseCommon() {
 | 
			
		|||
	// Regardless of whether the user sets it to true or false, if they
 | 
			
		||||
	// 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 to check that here as well
 | 
			
		||||
	if cmd.IsSet("-tlsverify") || commonFlags.TLSVerify {
 | 
			
		||||
	if cmd.IsSet("-"+tlsVerifyKey) || commonFlags.TLSVerify {
 | 
			
		||||
		commonFlags.TLS = true
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue