remove registry from tag

Author: dobrac

packages/shared/pkg/dockerhub/repository.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/google/go-containerregistry/pkg/name"
 	containerregistry "github.com/google/go-containerregistry/pkg/v1"
 
 	"github.com/e2b-dev/infra/packages/shared/pkg/env"
@@ -49,3 +50,13 @@ func GetRemoteRepository(ctx context.Context) (RemoteRepository, error) {
 
 	return nil, fmt.Errorf("unknown dockerhub remote repository provider: %s", provider)
 }
+
+func removeRegistryFromTag(tag string) (string, error) {
+	ref, err := name.ParseReference(tag)
+	if err != nil {
+		return "", fmt.Errorf("invalid image reference: %w", err)
+	}
+	refWithoutRegistry := ref.String()
+
+	return refWithoutRegistry, nil
+}

packages/shared/pkg/dockerhub/repository_aws.go

@@ -34,7 +34,12 @@ func NewAWSRemoteRepository(ctx context.Context, repositoryURL string) (*AWSRemo
 }
 
 func (g *AWSRemoteRepository) GetImage(ctx context.Context, tag string, platform containerregistry.Platform) (containerregistry.Image, error) {
-	ref, err := name.ParseReference(g.repositoryURL + "/" + tag)
+	tagWithoutRegistry, err := removeRegistryFromTag(tag)
+	if err != nil {
+		return nil, fmt.Errorf("error removing registry from tag: %w", err)
+	}
+
+	ref, err := name.ParseReference(g.repositoryURL + "/" + tagWithoutRegistry)
 	if err != nil {
 		return nil, fmt.Errorf("invalid image reference: %w", err)
 	}

packages/shared/pkg/dockerhub/repository_gcp.go

@@ -35,7 +35,12 @@ func NewGCPRemoteRepository(ctx context.Context, repositoryURL string) (*GCPRemo
 }
 
 func (g *GCPRemoteRepository) GetImage(ctx context.Context, tag string, platform containerregistry.Platform) (containerregistry.Image, error) {
-	ref, err := name.ParseReference(g.repositoryURL + "/" + tag)
+	tagWithoutRegistry, err := removeRegistryFromTag(tag)
+	if err != nil {
+		return nil, fmt.Errorf("error removing registry from tag: %w", err)
+	}
+
+	ref, err := name.ParseReference(g.repositoryURL + "/" + tagWithoutRegistry)
 	if err != nil {
 		return nil, fmt.Errorf("invalid image reference: %w", err)
 	}