From c7e1f91a9efc44a65e70913373e014abfb16f057 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Fri, 7 Aug 2015 14:01:34 -0700 Subject: [PATCH] Update Windows TP3 registry endpoints Signed-off-by: Arnaud Porterie --- registry/config.go | 2 -- registry/config_unix.go | 3 +++ registry/config_windows.go | 17 +++++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/registry/config.go b/registry/config.go index 678a330e88..5fca9df07c 100644 --- a/registry/config.go +++ b/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/" diff --git a/registry/config_unix.go b/registry/config_unix.go index 908ca2f6f4..32f167d08b 100644 --- a/registry/config_unix.go +++ b/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" diff --git a/registry/config_windows.go b/registry/config_windows.go index 3ebc044842..d01b2618af 100644 --- a/registry/config_windows.go +++ b/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`