@@ -5,6 +5,7 @@ import (

 	"github.com/docker/docker/daemon/config"

 	"github.com/docker/docker/opts"

+	"github.com/docker/docker/registry"

 	"github.com/spf13/pflag"

 )

@@ -19,7 +20,7 @@ const (

 func installCommonConfigFlags(conf *config.Config, flags *pflag.FlagSet) {

 	var maxConcurrentDownloads, maxConcurrentUploads int

-	conf.ServiceOptions.InstallCliFlags(flags)

+	installRegistryServiceFlags(&conf.ServiceOptions, flags)

 	flags.Var(opts.NewNamedListOptsRef("storage-opts", &conf.GraphOptions, nil), "storage-opt", "Storage driver options")

 	flags.Var(opts.NewNamedListOptsRef("authorization-plugins", &conf.AuthorizationPlugins, nil), "authorization-plugin", "Authorization plugins to load")

@@ -75,3 +76,17 @@ func installCommonConfigFlags(conf *config.Config, flags *pflag.FlagSet) {

 	conf.MaxConcurrentDownloads = &maxConcurrentDownloads

 	conf.MaxConcurrentUploads = &maxConcurrentUploads

 }

+

+func installRegistryServiceFlags(options *registry.ServiceOptions, flags *pflag.FlagSet) {

+	ana := opts.NewNamedListOptsRef("allow-nondistributable-artifacts", &options.AllowNondistributableArtifacts, registry.ValidateIndexName)

+	mirrors := opts.NewNamedListOptsRef("registry-mirrors", &options.Mirrors, registry.ValidateMirror)

+	insecureRegistries := opts.NewNamedListOptsRef("insecure-registries", &options.InsecureRegistries, registry.ValidateIndexName)

+

+	flags.Var(ana, "allow-nondistributable-artifacts", "Allow push of nondistributable artifacts to registry")

+	flags.Var(mirrors, "registry-mirror", "Preferred Docker registry mirror")

+	flags.Var(insecureRegistries, "insecure-registry", "Enable insecure registry communication")

+

+	if runtime.GOOS != "windows" {

+		flags.BoolVar(&options.V2Only, "disable-legacy-registry", true, "Disable contacting legacy registries")

+	}

+}

@@ -10,10 +10,8 @@ import (

 	"github.com/docker/distribution/reference"

 	registrytypes "github.com/docker/docker/api/types/registry"

-	"github.com/docker/docker/opts"

 	"github.com/pkg/errors"

 	"github.com/sirupsen/logrus"

-	"github.com/spf13/pflag"

 )

 // ServiceOptions holds command line options.

@@ -72,20 +70,6 @@ var (

 // for mocking in unit tests

 var lookupIP = net.LookupIP

-// InstallCliFlags adds command-line options to the top-level flag parser for

-// the current process.

-func (options *ServiceOptions) InstallCliFlags(flags *pflag.FlagSet) {

-	ana := opts.NewNamedListOptsRef("allow-nondistributable-artifacts", &options.AllowNondistributableArtifacts, ValidateIndexName)

-	mirrors := opts.NewNamedListOptsRef("registry-mirrors", &options.Mirrors, ValidateMirror)

-	insecureRegistries := opts.NewNamedListOptsRef("insecure-registries", &options.InsecureRegistries, ValidateIndexName)

-

-	flags.Var(ana, "allow-nondistributable-artifacts", "Allow push of nondistributable artifacts to registry")

-	flags.Var(mirrors, "registry-mirror", "Preferred Docker registry mirror")

-	flags.Var(insecureRegistries, "insecure-registry", "Enable insecure registry communication")

-

-	options.installCliPlatformFlags(flags)

-}

-

 // newServiceConfig returns a new instance of ServiceConfig

 func newServiceConfig(options ServiceOptions) *serviceConfig {

 	config := &serviceConfig{

@@ -2,10 +2,6 @@

 package registry

-import (

-	"github.com/spf13/pflag"

-)

-

 var (

 	// CertsDir is the directory where certificates are stored

 	CertsDir = "/etc/docker/certs.d"

@@ -18,8 +14,3 @@ var (

 func cleanPath(s string) string {

 	return s

 }

-

-// installCliPlatformFlags handles any platform specific flags for the service.

-func (options *ServiceOptions) installCliPlatformFlags(flags *pflag.FlagSet) {

-	flags.BoolVar(&options.V2Only, "disable-legacy-registry", true, "Disable contacting legacy registries")

-}

@@ -4,8 +4,6 @@ import (

 	"os"

 	"path/filepath"

 	"strings"

-

-	"github.com/spf13/pflag"

 )

 // CertsDir is the directory where certificates are stored

@@ -18,8 +16,3 @@ var CertsDir = os.Getenv("programdata") + `\docker\certs.d`

 func cleanPath(s string) string {

 	return filepath.FromSlash(strings.Replace(s, ":", "", -1))

 }

-

-// installCliPlatformFlags handles any platform specific flags for the service.

-func (options *ServiceOptions) installCliPlatformFlags(flags *pflag.FlagSet) {

-	// No Windows specific flags.

-}