1. docker
  2. Commit 87535ca2e9fee074b4174ecc5b01c91a9e922f54
Browse code

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>

Aaron Lehmann authored on 2016/03/11 05:26:32
Showing 3 changed files
registry/config.go
History View file @ 87535ca
... ... 
@@ -34,7 +34,17 @@ var (
34 34 
 	// NotaryServer is the endpoint serving the Notary trust server
35 35 
 	NotaryServer = "https://notary.docker.io"
36 36
37 
-	// IndexServer = "https://registry-stage.hub.docker.com/v1/"
37 
+	// DefaultV1Registry is the URI of the default v1 registry
38 
+	DefaultV1Registry = &url.URL{
39 
+		Scheme: "https",
40 
+		Host:   "index.docker.io",
41 
+	}
42 
+
43 
+	// DefaultV2Registry is the URI of the default v2 registry
44 
+	DefaultV2Registry = &url.URL{
45 
+		Scheme: "https",
46 
+		Host:   "registry-1.docker.io",
47 
+	}
38 48 
 )
39 49
40 50 
 var (
registry/config_unix.go
History View file @ 87535ca
... ... 
@@ -2,24 +2,6 @@
2 2
3 3 
 package registry
4 4
5 
-import (
6 
-	"net/url"
7 
-)
8 
-
9 
-var (
10 
-	// DefaultV1Registry is the URI of the default v1 registry
11 
-	DefaultV1Registry = &url.URL{
12 
-		Scheme: "https",
13 
-		Host:   "index.docker.io",
14 
-	}
15 
-
16 
-	// DefaultV2Registry is the URI of the default v2 registry
17 
-	DefaultV2Registry = &url.URL{
18 
-		Scheme: "https",
19 
-		Host:   "registry-1.docker.io",
20 
-	}
21 
-)
22 
-
23 5 
 var (
24 6 
 	// CertsDir is the directory where certificates are stored
25 7 
 	CertsDir = "/etc/docker/certs.d"
registry/config_windows.go
History View file @ 87535ca
... ... 
@@ -1,30 +1,11 @@
1 1 
 package registry
2 2
3 3 
 import (
4 
-	"net/url"
5 4 
 	"os"
6 5 
 	"path/filepath"
7 6 
 	"strings"
8 7 
 )
9 8
10 
-var (
11 
-	// DefaultV1Registry is the URI of the default v1 registry
12 
-	DefaultV1Registry = &url.URL{
13 
-		Scheme: "https",
14 
-		Host:   "registry-win-tp3.docker.io",
15 
-	}
16 
-
17 
-	// DefaultV2Registry is the URI of the default (official) v2 registry.
18 
-	// This is the windows-specific endpoint.
19 
-	//
20 
-	// Currently it is a TEMPORARY link that allows Microsoft to continue
21 
-	// development of Docker Engine for Windows.
22 
-	DefaultV2Registry = &url.URL{
23 
-		Scheme: "https",
24 
-		Host:   "registry-win-tp3.docker.io",
25 
-	}
26 
-)
27 
-
28 9 
 // CertsDir is the directory where certificates are stored
29 10 
 var CertsDir = os.Getenv("programdata") + `\docker\certs.d`
30 11