Merge pull request #21100 from aaronlehmann/remove-windows-specific-registry

Remove Windows-specific default registry definitions

docs/config.go

@@ -44,7 +44,17 @@ var (
 	// NotaryServer is the endpoint serving the Notary trust server
 	NotaryServer = "https://notary.docker.io"
 
-	// IndexServer = "https://registry-stage.hub.docker.com/v1/"
+	// DefaultV1Registry is the URI of the default v1 registry
+	DefaultV1Registry = &url.URL{
+		Scheme: "https",
+		Host:   "index.docker.io",
+	}
+
+	// DefaultV2Registry is the URI of the default v2 registry
+	DefaultV2Registry = &url.URL{
+		Scheme: "https",
+		Host:   "registry-1.docker.io",
+	}
 )
 
 var (

docs/config_unix.go

@@ -2,24 +2,6 @@
 
 package registry
 
-import (
-	"net/url"
-)
-
-var (
-	// DefaultV1Registry is the URI of the default v1 registry
-	DefaultV1Registry = &url.URL{
-		Scheme: "https",
-		Host:   "index.docker.io",
-	}
-
-	// DefaultV2Registry is the URI of the default v2 registry
-	DefaultV2Registry = &url.URL{
-		Scheme: "https",
-		Host:   "registry-1.docker.io",
-	}
-)
-
 var (
 	// CertsDir is the directory where certificates are stored
 	CertsDir = "/etc/docker/certs.d"

docs/config_windows.go

@@ -1,30 +1,11 @@
 package registry
 
 import (
-	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
 )
 
-var (
-	// DefaultV1Registry is the URI of the default v1 registry
-	DefaultV1Registry = &url.URL{
-		Scheme: "https",
-		Host:   "registry-win-tp3.docker.io",
-	}
-
-	// DefaultV2Registry is the URI of the default (official) v2 registry.
-	// This is the windows-specific endpoint.
-	//
-	// Currently it is a TEMPORARY link that allows Microsoft to continue
-	// development of Docker Engine for Windows.
-	DefaultV2Registry = &url.URL{
-		Scheme: "https",
-		Host:   "registry-win-tp3.docker.io",
-	}
-)
-
 // CertsDir is the directory where certificates are stored
 var CertsDir = os.Getenv("programdata") + `\docker\certs.d`