fix: build failed when registry address with port (#47)

Signed-off-by: chlins <[email protected]>

Author: chlins

pkg/backend/build.go

@@ -57,15 +57,15 @@ func (b *backend) Build(ctx context.Context, modelfilePath, workDir, target stri
 	// build the image config.
 	configDesc, err := build.BuildConfig(ctx, b.store, repo)
 	if err != nil {
-		return fmt.Errorf("faile to build image config: %w", err)
+		return fmt.Errorf("failed to build image config: %w", err)
 	}
 
 	fmt.Printf("%-15s => %s (%s)\n", "Built config", configDesc.Digest, humanize.IBytes(uint64(configDesc.Size)))
 
 	// build the image manifest.
 	manifestDesc, err := build.BuildManifest(ctx, b.store, repo, tag, layers, configDesc, manifestAnnotation(modelfile))
 	if err != nil {
-		return fmt.Errorf("faile to build image manifest: %w", err)
+		return fmt.Errorf("failed to build image manifest: %w", err)
 	}
 
 	fmt.Printf("%-15s => %s (%s)\n", "Built manifest", manifestDesc.Digest, humanize.IBytes(uint64(manifestDesc.Size)))

pkg/backend/extract.go

@@ -52,7 +52,7 @@ func (b *backend) Extract(ctx context.Context, target string, output string) err
 	return exportModelArtifact(ctx, b.store, manifest, repo, output)
 }
 
-// exportModelArtifact exports the target model artifact to the output directory, which will open the artifact and extract to restore the orginal repo structure.
+// exportModelArtifact exports the target model artifact to the output directory, which will open the artifact and extract to restore the original repo structure.
 func exportModelArtifact(ctx context.Context, store storage.Storage, manifest ocispec.Manifest, repo, output string) error {
 	for _, layer := range manifest.Layers {
 		// pull the blob from the storage.

pkg/backend/processor/license.go

@@ -21,8 +21,8 @@ import (
 	"os"
 
 	"github.com/CloudNativeAI/modctl/pkg/backend/build"
-	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/pkg/storage"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
@@ -46,7 +46,7 @@ func (p *licenseProcessor) Identify(_ context.Context, path string, info os.File
 func (p *licenseProcessor) Process(ctx context.Context, store storage.Storage, repo, path, workDir string) (ocispec.Descriptor, error) {
 	desc, err := build.BuildLayer(ctx, store, repo, path, workDir)
 	if err != nil {
-		return ocispec.Descriptor{}, nil
+		return ocispec.Descriptor{}, err
 	}
 
 	// add license annotations.

pkg/backend/processor/model.go

@@ -22,8 +22,8 @@ import (
 	"regexp"
 
 	"github.com/CloudNativeAI/modctl/pkg/backend/build"
-	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/pkg/storage"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
@@ -58,7 +58,7 @@ func (p *modelProcessor) Identify(_ context.Context, path string, info os.FileIn
 func (p *modelProcessor) Process(ctx context.Context, store storage.Storage, repo, path, workDir string) (ocispec.Descriptor, error) {
 	desc, err := build.BuildLayer(ctx, store, repo, path, workDir)
 	if err != nil {
-		return ocispec.Descriptor{}, nil
+		return ocispec.Descriptor{}, err
 	}
 
 	// add model annotations.

pkg/backend/processor/model_config.go

@@ -22,8 +22,8 @@ import (
 	"regexp"
 
 	"github.com/CloudNativeAI/modctl/pkg/backend/build"
-	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/pkg/storage"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
@@ -58,7 +58,7 @@ func (p *modelConfigProcessor) Identify(_ context.Context, path string, info os.
 func (p *modelConfigProcessor) Process(ctx context.Context, store storage.Storage, repo, path, workDir string) (ocispec.Descriptor, error) {
 	desc, err := build.BuildLayer(ctx, store, repo, path, workDir)
 	if err != nil {
-		return ocispec.Descriptor{}, nil
+		return ocispec.Descriptor{}, err
 	}
 
 	// add config annotations.

pkg/backend/processor/readme.go

@@ -21,8 +21,8 @@ import (
 	"os"
 
 	"github.com/CloudNativeAI/modctl/pkg/backend/build"
-	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/pkg/storage"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
@@ -46,7 +46,7 @@ func (p *readmeProcessor) Identify(_ context.Context, path string, info os.FileI
 func (p *readmeProcessor) Process(ctx context.Context, store storage.Storage, repo, path, workDir string) (ocispec.Descriptor, error) {
 	desc, err := build.BuildLayer(ctx, store, repo, path, workDir)
 	if err != nil {
-		return ocispec.Descriptor{}, nil
+		return ocispec.Descriptor{}, err
 	}
 
 	// add readme annotations.

pkg/storage/distribution/distribution.go

@@ -21,6 +21,7 @@ import (
 	"crypto/sha256"
 	"fmt"
 	"io"
+	"regexp"
 
 	distribution "github.com/distribution/distribution/v3"
 	registry "github.com/distribution/distribution/v3/registry/storage"
@@ -31,6 +32,14 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+func init() {
+	// The PathRegexp in the distribution package is used to validate the repository name,
+	// which not cover the case of the repository name includes the :port, so mutate the regexp to support it.
+	// original regexp: ^(/[A-Za-z0-9._-]+)+$
+	// new regexp:      ^(/[A-Za-z0-9._:-]+)+$
+	driver.PathRegexp = regexp.MustCompile(`^(/[A-Za-z0-9._:-]+)+$`)
+}
+
 const (
 	// StorageTypeDistribution is the storage type of distribution.
 	StorageTypeDistribution = "distribution"