Skip to content

Commit

Permalink
Merge pull request moby#15417 from icecrime/update_windows_registry_e…
Browse files Browse the repository at this point in the history
…ndpoint

Update Windows TP3 registry endpoints
  • Loading branch information
Jessie Frazelle committed Aug 19, 2015
2 parents aacb47d + c7e1f91 commit 3dc30d4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
2 changes: 0 additions & 2 deletions registry/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
3 changes: 3 additions & 0 deletions registry/config_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
17 changes: 11 additions & 6 deletions registry/config_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down

0 comments on commit 3dc30d4

Please sign in to comment.