浏览代码

Merge pull request #15417 from icecrime/update_windows_registry_endpoint

Update Windows TP3 registry endpoints
Jessie Frazelle 10 年之前
父节点
当前提交
3dc30d47e1
共有 3 个文件被更改,包括 14 次插入8 次删除
  1. 0 2
      registry/config.go
  2. 3 0
      registry/config_unix.go
  3. 11 6
      registry/config_windows.go

+ 0 - 2
registry/config.go

@@ -26,8 +26,6 @@ const (
 	// DefaultRegistryVersionHeader is the name of the default HTTP header
 	// that carries Registry version info
 	DefaultRegistryVersionHeader = "Docker-Distribution-Api-Version"
-	// DefaultV1Registry is the URI of the default v1 registry
-	DefaultV1Registry = "https://index.docker.io"
 
 	// IndexServer is the v1 registry server used for user auth + account creation
 	IndexServer = DefaultV1Registry + "/v1/"

+ 3 - 0
registry/config_unix.go

@@ -3,6 +3,9 @@
 package registry
 
 const (
+	// DefaultV1Registry is the URI of the default v1 registry
+	DefaultV1Registry = "https://index.docker.io"
+
 	// DefaultV2Registry is the URI of the default v2 registry
 	DefaultV2Registry = "https://registry-1.docker.io"
 

+ 11 - 6
registry/config_windows.go

@@ -6,12 +6,17 @@ import (
 	"strings"
 )
 
-// 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.
-const DefaultV2Registry = "https://ms-tp3.registry-1.docker.io"
+const (
+	// DefaultV1Registry is the URI of the default v1 registry
+	DefaultV1Registry = "https://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 = "https://registry-win-tp3.docker.io"
+)
 
 // CertsDir is the directory where certificates are stored
 var CertsDir = os.Getenv("programdata") + `\docker\certs.d`