Merge pull request #15417 from icecrime/update_windows_registry_endpoint

Update Windows TP3 registry endpoints
This commit is contained in:
Jessie Frazelle 2015-08-18 20:35:02 -07:00
commit e3ebcaa76b
3 changed files with 14 additions and 8 deletions

View file

@ -26,8 +26,6 @@ const (
// DefaultRegistryVersionHeader is the name of the default HTTP header // DefaultRegistryVersionHeader is the name of the default HTTP header
// that carries Registry version info // that carries Registry version info
DefaultRegistryVersionHeader = "Docker-Distribution-Api-Version" 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 is the v1 registry server used for user auth + account creation
IndexServer = DefaultV1Registry + "/v1/" IndexServer = DefaultV1Registry + "/v1/"

View file

@ -3,6 +3,9 @@
package registry package registry
const ( 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 is the URI of the default v2 registry
DefaultV2Registry = "https://registry-1.docker.io" DefaultV2Registry = "https://registry-1.docker.io"

View file

@ -6,12 +6,17 @@ import (
"strings" "strings"
) )
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. // DefaultV2Registry is the URI of the default (official) v2 registry.
// This is the windows-specific endpoint. // This is the windows-specific endpoint.
// //
// Currently it is a TEMPORARY link that allows Microsoft to continue // Currently it is a TEMPORARY link that allows Microsoft to continue
// development of Docker Engine for Windows. // development of Docker Engine for Windows.
const DefaultV2Registry = "https://ms-tp3.registry-1.docker.io" DefaultV2Registry = "https://registry-win-tp3.docker.io"
)
// CertsDir is the directory where certificates are stored // CertsDir is the directory where certificates are stored
var CertsDir = os.Getenv("programdata") + `\docker\certs.d` var CertsDir = os.Getenv("programdata") + `\docker\certs.d`