feat(docker): Add support for docker.io prefix

gabe565 · Feb 9, 2024 · 8c1856f · 8c1856f
1 parent 8d63daf
commit 8c1856f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/internal/docker/registry.go b/internal/docker/registry.go
@@ -9,7 +9,7 @@ import (
 )
 
 type Registry interface {
-	Name() string
+	Names() []string
 
 	ApiUrl() string
 	TokenUrl(repo string) string
@@ -41,8 +41,10 @@ var ErrInvalidRegistry = errors.New("no registry for repo")
 
 func FindRegistry(repo string) (Registry, error) {
 	for _, registry := range registries {
-		if strings.HasPrefix(repo, registry.Name()) {
-			return registry, nil
+		for _, name := range registry.Names() {
+			if strings.HasPrefix(repo, name) {
+				return registry, nil
+			}
 		}
 	}
 	return nil, fmt.Errorf("%w: %s", ErrInvalidRegistry, repo)

diff --git a/internal/docker/registry_dockerhub.go b/internal/docker/registry_dockerhub.go
@@ -24,8 +24,8 @@ func init() {
 
 type DockerHub struct{}
 
-func (d DockerHub) Name() string {
-	return ""
+func (d DockerHub) Names() []string {
+	return []string{"", "docker.io"}
 }
 
 func (d DockerHub) ApiUrl() string {
@@ -46,6 +46,7 @@ func (d DockerHub) Transport(_ context.Context, repo string) (http.RoundTripper,
 }
 
 func (d DockerHub) NormalizeRepo(repo string) string {
+	repo = strings.TrimPrefix(repo, "docker.io/")
 	if !strings.Contains(repo, "/") {
 		return "library/" + repo
 	}

diff --git a/internal/docker/registry_ghcr.go b/internal/docker/registry_ghcr.go
@@ -107,8 +107,8 @@ type Ghcr struct {
 	refreshedAt    time.Time
 }
 
-func (g Ghcr) Name() string {
-	return "ghcr.io"
+func (g Ghcr) Names() []string {
+	return []string{"ghcr.io"}
 }
 
 func (g Ghcr) ApiUrl() string {