From 2f170573145d7fb8a24ed8e0df11555aa8336ec0 Mon Sep 17 00:00:00 2001
From: Aaron Lehmann <aaron.lehmann@docker.com>
Date: Thu, 10 Mar 2016 12:26:32 -0800
Subject: [PATCH] Remove Windows-specific default registry definitions

Going forward, Docker won't use a different default registry on Windows.
This changes Windows to use the standard Docker Hub registry as the
default registry.

There is a plan in place to migrate existing images from the Windows
registry to Hub's normal registry, in advance of the 1.11 release. In
the mean time, images on the Windows registry can be accessed by
prefixing them with `registry-win-tp3.docker.io/`.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
---
 docs/config.go         | 12 +++++++++++-
 docs/config_unix.go    | 18 ------------------
 docs/config_windows.go | 19 -------------------
 3 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/docs/config.go b/docs/config.go
index 7d8b6301a..561e1d6e1 100644
--- a/docs/config.go
+++ b/docs/config.go
@@ -34,7 +34,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 (
diff --git a/docs/config_unix.go b/docs/config_unix.go
index c3c19162f..b81d24933 100644
--- a/docs/config_unix.go
+++ b/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"
diff --git a/docs/config_windows.go b/docs/config_windows.go
index f1ee488b1..82bc4afea 100644
--- a/docs/config_windows.go
+++ b/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`