Merge pull request #3721 from tonistiigi/imagetools-oci-layout

imagetools: add oci-layout support

Author: tonistiigi

build/build.go

@@ -805,11 +805,10 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opts map[
 
 							itpull := imagetools.New(imageopt)
 
-							ref, err := reference.ParseNormalizedNamed(names[0])
+							ref, err := imagetools.ParseLocation(names[0])
 							if err != nil {
 								return err
 							}
-							ref = reference.TagNameOnly(ref)
 
 							srcs := make([]*imagetools.Source, len(descs))
 							for i, desc := range descs {
@@ -832,7 +831,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opts map[
 							itpush := imagetools.New(imageopt)
 
 							for _, n := range names {
-								nn, err := reference.ParseNormalizedNamed(n)
+								nn, err := imagetools.ParseLocation(n)
 								if err != nil {
 									return err
 								}

build/opt.go

@@ -27,6 +27,7 @@ import (
 	"github.com/docker/buildx/util/buildflags"
 	"github.com/docker/buildx/util/confutil"
 	"github.com/docker/buildx/util/dockerutil"
+	"github.com/docker/buildx/util/ocilayout"
 	"github.com/docker/buildx/util/osutil"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/buildx/util/sourcemeta"
@@ -913,7 +914,11 @@ func loadInputs(ctx context.Context, d *driver.DriverHandle, inp *Inputs, pw pro
 
 		// handle OCI layout
 		if localPath, ok := strings.CutPrefix(v.Path, "oci-layout://"); ok {
-			localPath, dig, tag := parseOCILayoutPath(localPath)
+			ref, _, err := ocilayout.Parse("oci-layout://" + localPath)
+			if err != nil {
+				return nil, err
+			}
+			localPath, dig, tag := ref.Path, ref.Digest.String(), ref.Tag
 			if dig == "" {
 				dig, err = resolveDigest(localPath, tag)
 				if err != nil {
@@ -1402,38 +1407,6 @@ func isActive(ce *client.CacheOptionsEntry) bool {
 	return ce.Attrs["token"] != "" && (ce.Attrs["url"] != "" || ce.Attrs["url_v2"] != "")
 }
 
-// parseOCILayoutPath handles the oci-layout url accepted by buildx.
-func parseOCILayoutPath(s string) (localPath, dgst, tag string) {
-	localPath = s
-
-	// Look for the digest reference. There might be multiple @ symbols
-	// in the path and the @ symbol may be part of the path or part of
-	// the digest. If we find the @ symbol, verify that it's a valid
-	// digest reference instead of just assuming it is because it
-	// might be part of the file path.
-	if i := strings.LastIndex(localPath, "@"); i >= 0 {
-		after := localPath[i+1:]
-		if reference.DigestRegexp.MatchString(after) {
-			localPath, dgst = localPath[:i], after
-		}
-	}
-
-	// Do the same with the tag. This isn't as necessary since colons
-	// aren't valid as file paths on Linux/Unix systems, but they are valid
-	// on Windows systems so we might as well just be safe.
-	if i := strings.LastIndex(localPath, ":"); i >= 0 {
-		after := localPath[i+1:]
-		if reference.TagRegexp.MatchString(after) {
-			localPath, tag = localPath[:i], after
-		}
-	}
-
-	if tag == "" {
-		tag = "latest"
-	}
-	return
-}
-
 func defaultPlatform(bopts gateway.BuildOpts) *ocispecs.Platform {
 	pl := bopts.Workers[0].Platforms
 	if len(pl) == 0 {

build/opt_test.go

@@ -40,48 +40,6 @@ func TestCacheOptions_DerivedVars(t *testing.T) {
 	}, CreateCaches(cacheFrom))
 }
 
-func TestParseOCILayoutPath(t *testing.T) {
-	for _, tt := range []struct {
-		s    string
-		path string
-		dgst string
-		tag  string
-	}{
-		{
-			s:    "/path/to/oci/layout",
-			path: "/path/to/oci/layout",
-			tag:  "latest",
-		},
-		{
-			s:    "/path/to/oci/layout:1.3",
-			path: "/path/to/oci/layout",
-			tag:  "1.3",
-		},
-		{
-			s:    "/path/to/oci/layout@sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-			path: "/path/to/oci/layout",
-			dgst: "sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-			tag:  "latest",
-		},
-		{
-			s:    "/path/to/oci/@/layout@sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-			path: "/path/to/oci/@/layout",
-			dgst: "sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-			tag:  "latest",
-		},
-		{
-			s:    "/path/to/oci/@/layout",
-			path: "/path/to/oci/@/layout",
-			tag:  "latest",
-		},
-	} {
-		path, dgst, tag := parseOCILayoutPath(tt.s)
-		assert.Equal(t, tt.path, path, "comparing path: %s", tt.s)
-		assert.Equal(t, tt.dgst, dgst, "comparing digest: %s", tt.s)
-		assert.Equal(t, tt.tag, tag, "comparing tag: %s", tt.s)
-	}
-}
-
 func TestCreateExports_RegistryUnpack(t *testing.T) {
 	tests := []struct {
 		name       string

commands/imagetools/create.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/containerd/containerd/v2/core/remotes"
 	"github.com/containerd/platforms"
-	"github.com/distribution/reference"
 	"github.com/docker/buildx/builder"
 	"github.com/docker/buildx/util/buildflags"
 	"github.com/docker/buildx/util/cobrautil/completion"
@@ -60,7 +59,7 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
 
 	args = append(fileArgs, args...)
 
-	tags, err := parseRefs(in.tags)
+	tags, err := parseLocations(in.tags)
 	if err != nil {
 		return err
 	}
@@ -102,10 +101,16 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
 		return errors.Errorf("no repositories specified, please set a reference in tag or source")
 	}
 
-	var defaultRepo *string
+	var defaultRepo *imagetools.Location
 	if len(repos) == 1 {
-		for repo := range repos {
-			defaultRepo = &repo
+		for _, src := range srcs {
+			if src.Ref != nil {
+				defaultRepo = src.Ref
+				break
+			}
+		}
+		if defaultRepo == nil && len(tags) > 0 {
+			defaultRepo = tags[0]
 		}
 	}
 
@@ -114,19 +119,19 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
 			if defaultRepo == nil {
 				return errors.Errorf("multiple repositories specified, cannot infer repository for %q", args[i])
 			}
-			n, err := reference.ParseNormalizedNamed(*defaultRepo)
-			if err != nil {
-				return err
-			}
 			if s.Desc.MediaType == "" && s.Desc.Digest != "" {
-				r, err := reference.WithDigest(n, s.Desc.Digest)
+				r, err := defaultRepo.WithDigest(s.Desc.Digest)
 				if err != nil {
 					return err
 				}
 				srcs[i].Ref = r
 				sourceRefs = true
 			} else {
-				srcs[i].Ref = reference.TagNameOnly(n)
+				r, err := defaultRepo.TagNameOnly()
+				if err != nil {
+					return err
+				}
+				srcs[i].Ref = r
 			}
 		}
 	}
@@ -209,7 +214,7 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
 	eg, _ := errgroup.WithContext(ctx)
 	pw := progress.WithPrefix(printer, "internal", true)
 
-	tagsByRepo := map[string][]reference.Named{}
+	tagsByRepo := map[string][]*imagetools.Location{}
 	for _, t := range tags {
 		repo := t.Name()
 		tagsByRepo[repo] = append(tagsByRepo[repo], t)
@@ -224,10 +229,14 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
 				for _, desc := range manifests {
 					eg2.Go(func() error {
 						sub.Log(1, fmt.Appendf(nil, "copying %s from %s to %s\n", desc.Digest.String(), desc.Source.Ref.String(), repo))
-						return r.Copy(ctx, &imagetools.Source{
+						err := r.Copy(ctx, &imagetools.Source{
 							Ref:  desc.Source.Ref,
 							Desc: desc.Descriptor,
 						}, seed)
+						if err != nil {
+							return errors.Wrapf(err, "copy %s from %s to %s", desc.Digest.String(), desc.Source.Ref.String(), seed.String())
+						}
+						return nil
 					})
 				}
 				if err := eg2.Wait(); err != nil {
@@ -236,7 +245,7 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
 				for _, t := range repoTags {
 					sub.Log(1, fmt.Appendf(nil, "pushing %s to %s\n", desc.Digest.String(), t.String()))
 					if err := r.Push(ctx, t, desc, dt); err != nil {
-						return err
+						return errors.Wrapf(err, "publish %s to %s", desc.Digest.String(), t.String())
 					}
 				}
 				return nil
@@ -302,10 +311,10 @@ func withMediaTypeKeyPrefix(ctx context.Context) context.Context {
 	return ctx
 }
 
-func parseRefs(in []string) ([]reference.Named, error) {
-	refs := make([]reference.Named, len(in))
+func parseLocations(in []string) ([]*imagetools.Location, error) {
+	refs := make([]*imagetools.Location, len(in))
 	for i, in := range in {
-		n, err := reference.ParseNormalizedNamed(in)
+		n, err := imagetools.ParseLocation(in)
 		if err != nil {
 			return nil, err
 		}
@@ -327,10 +336,10 @@ func parseSource(in string) (*imagetools.Source, error) {
 		return nil, err
 	}
 
-	ref, err := reference.ParseNormalizedNamed(in)
+	loc, err := imagetools.ParseLocation(in)
 	if err == nil {
 		return &imagetools.Source{
-			Ref: ref,
+			Ref: loc,
 		}, nil
 	} else if !strings.HasPrefix(in, "{") {
 		return nil, err