Skip to content

allow empty index endpoint for private repositories #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gesellix wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow empty index endpoint for private repositories #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,36 @@ type LayerJson struct {
}

func NewRegistry(endpoint string, registryDomain string) (*Registry, error) {
u, e := url.Parse(endpoint)
if endpoint == "" && registryDomain == "" {
return nil, fmt.Errorf("needs a registry endpoint when index endpoint is missing")
}
parseEndpoint := func(endpoint string) (*url.URL, error) {
if endpoint != "" {
u, e := url.Parse(endpoint)
if e != nil {
return nil, e
}
if u.Host == "" {
u.Host = u.Path
}
return u, nil
}
return nil, nil
}
host := ""
origUrl, e := parseEndpoint(endpoint)
if e != nil {
return nil, e
}
if u.Host == "" {
u.Host = u.Path
if origUrl != nil {
host = fmt.Sprintf("%s://%s", origUrl.Scheme, origUrl.Host)
}
origUrl := u
host := fmt.Sprintf("%s://%s", u.Scheme, u.Host)
registryHost := ""
if registryDomain != "" {
u, e = url.Parse(registryDomain)
u, e := parseEndpoint(registryDomain)
if e != nil {
return nil, e
}
if u.Host == "" {
u.Host = u.Path
}
registryHost = fmt.Sprintf("%s://%s", u.Scheme, u.Host)
}
client := &http.Client{}
Expand All @@ -63,6 +75,9 @@ func (reg *Registry) log(format string, args ...interface{}) {
}

func (reg *Registry) GetToken(username string, password string, reposName string) (string, error) {
if reg.Host == "" {
return "", nil
}
u := fmt.Sprintf("%s/v1/repositories/%s/images", reg.Host, reposName)
req, e := http.NewRequest("GET", u, nil)
if e != nil {
Expand Down