mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	This fixes the hard coded restriction for non-linux platforms to v2 registries. Previously, the check was above the flag parsing, which would overwrite the hard coded value and prevent correct operation. This change also removes the related daemon flag from Windows to avoid confusion, as it has no meaning when the value is going to always be hard coded to true. Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
		
			
				
	
	
		
			25 lines
		
	
	
	
		
			830 B
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			25 lines
		
	
	
	
		
			830 B
		
	
	
	
		
			Go
		
	
	
	
	
	
// +build !windows
 | 
						|
 | 
						|
package registry
 | 
						|
 | 
						|
import (
 | 
						|
	flag "github.com/docker/docker/pkg/mflag"
 | 
						|
)
 | 
						|
 | 
						|
var (
 | 
						|
	// CertsDir is the directory where certificates are stored
 | 
						|
	CertsDir = "/etc/docker/certs.d"
 | 
						|
)
 | 
						|
 | 
						|
// cleanPath is used to ensure that a directory name is valid on the target
 | 
						|
// platform. It will be passed in something *similar* to a URL such as
 | 
						|
// https:/index.docker.io/v1. Not all platforms support directory names
 | 
						|
// which contain those characters (such as : on Windows)
 | 
						|
func cleanPath(s string) string {
 | 
						|
	return s
 | 
						|
}
 | 
						|
 | 
						|
// installCliPlatformFlags handles any platform specific flags for the service.
 | 
						|
func (options *ServiceOptions) installCliPlatformFlags(cmd *flag.FlagSet, usageFn func(string) string) {
 | 
						|
	cmd.BoolVar(&options.V2Only, []string{"-disable-legacy-registry"}, false, usageFn("Disable contacting legacy registries"))
 | 
						|
}
 |