dkirillov/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Allow private V2 registry endpoints

Browse source 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan 2014-12-19 14:44:18 -08:00
parent 751a1a8dd0
commit 6f36ce3a01
3 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/config.go
View file

@ -23,7 +23,7 @@ type Options struct {
const (
// Only used for user auth + account creation
INDEXSERVER = "https://index.docker.io/v1/"
REGISTRYSERVER = "https://registry-1.docker.io/v1/"
REGISTRYSERVER = "https://registry-1.docker.io/v2/"
INDEXNAME = "docker.io"
// INDEXSERVER = "https://registry-stage.hub.docker.com/v1/"

2
docs/endpoint.go
View file

@ -10,6 +10,7 @@ import (
"strings"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/registry/v2"
)
// for mocking in unit tests
@ -103,6 +104,7 @@ type Endpoint struct {
Version APIVersion
IsSecure bool
AuthChallenges []*AuthorizationChallenge
URLBuilder *v2.URLBuilder
}
// Get the formated URL for the root of this registry Endpoint

32
docs/session_v2.go
View file

@ -13,30 +13,36 @@ import (
"github.com/docker/docker/utils"
)
var registryURLBuilder *v2.URLBuilder
func init() {
u, err := url.Parse(REGISTRYSERVER)
if err != nil {
panic(fmt.Errorf("invalid registry url: %s", err))
}
registryURLBuilder = v2.NewURLBuilder(u)
}
func getV2Builder(e *Endpoint) *v2.URLBuilder {
return registryURLBuilder
if e.URLBuilder == nil {
e.URLBuilder = v2.NewURLBuilder(e.URL)
}
return e.URLBuilder
}
// GetV2Authorization gets the authorization needed to the given image
// If readonly access is requested, then only the authorization may
// only be used for Get operations.
func (r *Session) GetV2Authorization(imageName string, readOnly bool) (*RequestAuthorization, error) {
func (r *Session) GetV2Authorization(imageName string, readOnly bool) (auth *RequestAuthorization, err error) {
scopes := []string{"pull"}
if !readOnly {
scopes = append(scopes, "push")
}
return NewRequestAuthorization(r.GetAuthConfig(true), r.indexEndpoint, "repository", imageName, scopes)
var registry *Endpoint
if r.indexEndpoint.URL.Host == IndexServerURL.Host {
registry, err = NewEndpoint(REGISTRYSERVER, nil)
if err != nil {
return
}
} else {
registry = r.indexEndpoint
}
registry.URLBuilder = v2.NewURLBuilder(registry.URL)
r.indexEndpoint = registry
log.Debugf("Getting authorization for %s %s", imageName, scopes)
return NewRequestAuthorization(r.GetAuthConfig(true), registry, "repository", imageName, scopes)
}
//