@@ -50,12 +50,13 @@ func New(opt Opt) (exporter.Exporter, error) {

 	return im, nil

 }

-func (e *imageExporter) Resolve(ctx context.Context, id int, opt map[string]string) (exporter.ExporterInstance, error) {

+func (e *imageExporter) Resolve(ctx context.Context, id int, attrs map[string]string) (exporter.ExporterInstance, error) {

 	i := &imageExporterInstance{

 		imageExporter: e,

 		id:            id,

+		attrs:         attrs,

 	}

-	for k, v := range opt {

+	for k, v := range attrs {

 		switch exptypes.ImageExporterOptKey(k) {

 		case exptypes.OptKeyName:

 			for _, v := range strings.Split(v, ",") {

@@ -80,12 +81,17 @@ type imageExporterInstance struct {

 	id          int

 	targetNames []distref.Named

 	meta        map[string][]byte

+	attrs       map[string]string

 }

 func (e *imageExporterInstance) ID() int {

 	return e.id

 }

+func (e *imageExporterInstance) Type() string {

+	return "image"

+}

+

 func (e *imageExporterInstance) Name() string {

 	return "exporting to image"

 }

@@ -94,6 +100,10 @@ func (e *imageExporterInstance) Config() *exporter.Config {

 	return exporter.NewConfig()

 }

+func (e *imageExporterInstance) Attrs() map[string]string {

+	return e.attrs

+}

+

 func (e *imageExporterInstance) Export(ctx context.Context, inp *exporter.Source, inlineCache exptypes.InlineCache, sessionID string) (map[string]string, exporter.DescriptorReference, error) {

 	if len(inp.Refs) > 1 {

 		return nil, nil, fmt.Errorf("exporting multiple references to image store is currently unsupported")

@@ -35,7 +35,7 @@ require (

 	github.com/cpuguy83/tar2go v0.3.1

 	github.com/creack/pty v1.1.18

 	github.com/deckarep/golang-set/v2 v2.3.0

-	github.com/distribution/reference v0.5.0

+	github.com/distribution/reference v0.6.0

 	github.com/docker/distribution v2.8.3+incompatible

 	github.com/docker/go-connections v0.5.0

 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c

@@ -61,7 +61,7 @@ require (

 	github.com/miekg/dns v1.1.57

 	github.com/mistifyio/go-zfs/v3 v3.0.1

 	github.com/mitchellh/copystructure v1.2.0

-	github.com/moby/buildkit v0.14.0-rc2

+	github.com/moby/buildkit v0.14.0

 	github.com/moby/docker-image-spec v1.3.1

 	github.com/moby/ipvs v1.1.0

 	github.com/moby/locker v1.0.1

@@ -93,7 +93,7 @@ require (

 	github.com/vbatts/tar-split v0.11.5

 	github.com/vishvananda/netlink v1.2.1-beta.2

 	github.com/vishvananda/netns v0.0.4

-	go.etcd.io/bbolt v1.3.9

+	go.etcd.io/bbolt v1.3.10

 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1

 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1

 	go.opentelemetry.io/otel v1.21.0

@@ -210,8 +210,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm

 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=

 github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=

 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=

-github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=

-github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=

+github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=

+github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=

 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=

 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=

 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=

@@ -480,8 +480,8 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh

 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=

 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=

 github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs=

-github.com/moby/buildkit v0.14.0-rc2 h1:qvl0hOKeyAWReOkksNtstQjPNaAD4jN3Dvq4r7slqYM=

-github.com/moby/buildkit v0.14.0-rc2/go.mod h1:/ZJNHNVso1nf063XlDhEkNEcRNW19utVpUKixCUo9Ks=

+github.com/moby/buildkit v0.14.0 h1:mHv2lFS8znLDRc4SMyM2B9tPjxWh2blMvr0H7ARquNM=

+github.com/moby/buildkit v0.14.0/go.mod h1:1XssG7cAqv5Bz1xcGMxJL123iCv5TYN4Z/qf647gfuk=

 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=

 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=

 github.com/moby/ipvs v1.1.0 h1:ONN4pGaZQgAx+1Scz5RvWV4Q7Gb+mvfRh3NsPS+1XQQ=

@@ -718,8 +718,8 @@ github.com/zmap/zlint/v3 v3.1.0 h1:WjVytZo79m/L1+/Mlphl09WBob6YTGljN5IGWZFpAv0=

 github.com/zmap/zlint/v3 v3.1.0/go.mod h1:L7t8s3sEKkb0A2BxGy1IWrxt1ZATa1R4QfJZaQOD3zU=

 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=

 go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=

-go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI=

-go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE=

+go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=

+go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ=

 go.etcd.io/etcd/api/v3 v3.5.6/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8=

 go.etcd.io/etcd/client/pkg/v3 v3.5.6 h1:TXQWYceBKqLp4sa87rcPs11SXxUA/mHwH975v+BDvLU=

 go.etcd.io/etcd/client/pkg/v3 v3.5.6/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ=

@@ -10,7 +10,7 @@ Go library to handle references to container images.

 [![codecov](https://codecov.io/gh/distribution/reference/branch/main/graph/badge.svg)](https://codecov.io/gh/distribution/reference)

 [![FOSSA Status](https://app.fossa.com/api/projects/custom%2B162%2Fgithub.com%2Fdistribution%2Freference.svg?type=shield)](https://app.fossa.com/projects/custom%2B162%2Fgithub.com%2Fdistribution%2Freference?ref=badge_shield)

-This repository contains a library for handling refrences to container images held in container registries. Please see [godoc](https://pkg.go.dev/github.com/distribution/reference) for details.

+This repository contains a library for handling references to container images held in container registries. Please see [godoc](https://pkg.go.dev/github.com/distribution/reference) for details.

 ## Contribution

@@ -123,20 +123,51 @@ func ParseDockerRef(ref string) (Named, error) {

 // splitDockerDomain splits a repository name to domain and remote-name.

 // If no valid domain is found, the default domain is used. Repository name

 // needs to be already validated before.

-func splitDockerDomain(name string) (domain, remainder string) {

-	i := strings.IndexRune(name, '/')

-	if i == -1 || (!strings.ContainsAny(name[:i], ".:") && name[:i] != localhost && strings.ToLower(name[:i]) == name[:i]) {

-		domain, remainder = defaultDomain, name

-	} else {

-		domain, remainder = name[:i], name[i+1:]

-	}

-	if domain == legacyDefaultDomain {

-		domain = defaultDomain

-	}

-	if domain == defaultDomain && !strings.ContainsRune(remainder, '/') {

-		remainder = officialRepoPrefix + remainder

-	}

-	return

+func splitDockerDomain(name string) (domain, remoteName string) {

+	maybeDomain, maybeRemoteName, ok := strings.Cut(name, "/")

+	if !ok {

+		// Fast-path for single element ("familiar" names), such as "ubuntu"

+		// or "ubuntu:latest". Familiar names must be handled separately, to

+		// prevent them from being handled as "hostname:port".

+		//

+		// Canonicalize them as "docker.io/library/name[:tag]"

+

+		// FIXME(thaJeztah): account for bare "localhost" or "example.com" names, which SHOULD be considered a domain.

+		return defaultDomain, officialRepoPrefix + name

+	}

+

+	switch {

+	case maybeDomain == localhost:

+		// localhost is a reserved namespace and always considered a domain.

+		domain, remoteName = maybeDomain, maybeRemoteName

+	case maybeDomain == legacyDefaultDomain:

+		// canonicalize the Docker Hub and legacy "Docker Index" domains.

+		domain, remoteName = defaultDomain, maybeRemoteName

+	case strings.ContainsAny(maybeDomain, ".:"):

+		// Likely a domain or IP-address:

+		//

+		// - contains a "." (e.g., "example.com" or "127.0.0.1")

+		// - contains a ":" (e.g., "example:5000", "::1", or "[::1]:5000")

+		domain, remoteName = maybeDomain, maybeRemoteName

+	case strings.ToLower(maybeDomain) != maybeDomain:

+		// Uppercase namespaces are not allowed, so if the first element

+		// is not lowercase, we assume it to be a domain-name.

+		domain, remoteName = maybeDomain, maybeRemoteName

+	default:

+		// None of the above: it's not a domain, so use the default, and

+		// use the name input the remote-name.

+		domain, remoteName = defaultDomain, name

+	}

+

+	if domain == defaultDomain && !strings.ContainsRune(remoteName, '/') {

+		// Canonicalize "familiar" names, but only on Docker Hub, not

+		// on other domains:

+		//

+		// "docker.io/ubuntu[:tag]" => "docker.io/library/ubuntu[:tag]"

+		remoteName = officialRepoPrefix + remoteName

+	}

+

+	return domain, remoteName

 }

 // familiarizeName returns a shortened version of the name familiar

@@ -35,8 +35,13 @@ import (

 )

 const (

+	// RepositoryNameTotalLengthMax is the maximum total number of characters in a repository name.

+	RepositoryNameTotalLengthMax = 255

+

 	// NameTotalLengthMax is the maximum total number of characters in a repository name.

-	NameTotalLengthMax = 255

+	//

+	// Deprecated: use [RepositoryNameTotalLengthMax] instead.

+	NameTotalLengthMax = RepositoryNameTotalLengthMax

 )

 var (

@@ -55,8 +60,8 @@ var (

 	// ErrNameEmpty is returned for empty, invalid repository names.

 	ErrNameEmpty = errors.New("repository name must have at least one component")

-	// ErrNameTooLong is returned when a repository name is longer than NameTotalLengthMax.

-	ErrNameTooLong = fmt.Errorf("repository name must not be more than %v characters", NameTotalLengthMax)

+	// ErrNameTooLong is returned when a repository name is longer than RepositoryNameTotalLengthMax.

+	ErrNameTooLong = fmt.Errorf("repository name must not be more than %v characters", RepositoryNameTotalLengthMax)

 	// ErrNameNotCanonical is returned when a name is not canonical.

 	ErrNameNotCanonical = errors.New("repository name must be canonical")

@@ -165,6 +170,9 @@ func Path(named Named) (name string) {

 	return path

 }

+// splitDomain splits a named reference into a hostname and path string.

+// If no valid hostname is found, the hostname is empty and the full value

+// is returned as name

 func splitDomain(name string) (string, string) {

 	match := anchoredNameRegexp.FindStringSubmatch(name)

 	if len(match) != 3 {

@@ -173,19 +181,6 @@ func splitDomain(name string) (string, string) {

 	return match[1], match[2]

 }

-// SplitHostname splits a named reference into a

-// hostname and name string. If no valid hostname is

-// found, the hostname is empty and the full value

-// is returned as name

-//

-// Deprecated: Use [Domain] or [Path].

-func SplitHostname(named Named) (string, string) {

-	if r, ok := named.(namedRepository); ok {

-		return r.Domain(), r.Path()

-	}

-	return splitDomain(named.Name())

-}

-

 // Parse parses s and returns a syntactically valid Reference.

 // If an error was encountered it is returned, along with a nil Reference.

 func Parse(s string) (Reference, error) {

@@ -200,10 +195,6 @@ func Parse(s string) (Reference, error) {

 		return nil, ErrReferenceInvalidFormat

 	}

-	if len(matches[1]) > NameTotalLengthMax {

-		return nil, ErrNameTooLong

-	}

-

 	var repo repository

 	nameMatch := anchoredNameRegexp.FindStringSubmatch(matches[1])

@@ -215,6 +206,10 @@ func Parse(s string) (Reference, error) {

 		repo.path = matches[1]

 	}

+	if len(repo.path) > RepositoryNameTotalLengthMax {

+		return nil, ErrNameTooLong

+	}

+

 	ref := reference{

 		namedRepository: repo,

 		tag:             matches[2],

@@ -253,14 +248,15 @@ func ParseNamed(s string) (Named, error) {

 // WithName returns a named object representing the given string. If the input

 // is invalid ErrReferenceInvalidFormat will be returned.

 func WithName(name string) (Named, error) {

-	if len(name) > NameTotalLengthMax {

-		return nil, ErrNameTooLong

-	}

-

 	match := anchoredNameRegexp.FindStringSubmatch(name)

 	if match == nil || len(match) != 3 {

 		return nil, ErrReferenceInvalidFormat

 	}

+

+	if len(match[2]) > RepositoryNameTotalLengthMax {

+		return nil, ErrNameTooLong

+	}

+

 	return repository{

 		domain: match[1],

 		path:   match[2],

@@ -372,6 +372,7 @@ func (c *Controller) Solve(ctx context.Context, req *controlapi.SolveRequest) (*

 		if err != nil {

 			return nil, err

 		}

+		bklog.G(ctx).Debugf("resolve exporter %s with %v", ex.Type, ex.Attrs)

 		expi, err := exp.Resolve(ctx, i, ex.Attrs)

 		if err != nil {

 			return nil, err

@@ -20,6 +20,7 @@ import (

 	cerrdefs "github.com/containerd/errdefs"

 	"github.com/moby/buildkit/cache"

 	cacheconfig "github.com/moby/buildkit/cache/config"

+	"github.com/moby/buildkit/client"

 	"github.com/moby/buildkit/exporter"

 	"github.com/moby/buildkit/exporter/containerimage/exptypes"

 	"github.com/moby/buildkit/session"

@@ -68,6 +69,7 @@ func (e *imageExporter) Resolve(ctx context.Context, id int, opt map[string]stri

 	i := &imageExporterInstance{

 		imageExporter: e,

 		id:            id,

+		attrs:         opt,

 		opts: ImageCommitOpts{

 			RefCfg: cacheconfig.RefConfig{

 				Compression: compression.New(compression.Default),

@@ -168,7 +170,8 @@ func (e *imageExporter) Resolve(ctx context.Context, id int, opt map[string]stri

 type imageExporterInstance struct {

 	*imageExporter

-	id int

+	id    int

+	attrs map[string]string

 	opts                 ImageCommitOpts

 	push                 bool

@@ -194,6 +197,14 @@ func (e *imageExporterInstance) Config() *exporter.Config {

 	return exporter.NewConfigWithCompression(e.opts.RefCfg.Compression)

 }

+func (e *imageExporterInstance) Type() string {

+	return client.ExporterImage

+}

+

+func (e *imageExporterInstance) Attrs() map[string]string {

+	return e.attrs

+}

+

 func (e *imageExporterInstance) Export(ctx context.Context, src *exporter.Source, inlineCache exptypes.InlineCache, sessionID string) (_ map[string]string, descref exporter.DescriptorReference, err error) {

 	src = src.Clone()

 	if src.Metadata == nil {

@@ -22,6 +22,8 @@ type ExporterInstance interface {

 	ID() int

 	Name() string

 	Config() *Config

+	Type() string

+	Attrs() map[string]string

 	Export(ctx context.Context, src *Source, inlineCache exptypes.InlineCache, sessionID string) (map[string]string, DescriptorReference, error)

 }

@@ -8,6 +8,7 @@ import (

 	"time"

 	"github.com/moby/buildkit/cache"

+	"github.com/moby/buildkit/client"

 	"github.com/moby/buildkit/exporter"

 	"github.com/moby/buildkit/exporter/containerimage/exptypes"

 	"github.com/moby/buildkit/exporter/util/epoch"

@@ -38,6 +39,7 @@ func New(opt Opt) (exporter.Exporter, error) {

 func (e *localExporter) Resolve(ctx context.Context, id int, opt map[string]string) (exporter.ExporterInstance, error) {

 	i := &localExporterInstance{

 		id:            id,

+		attrs:         opt,

 		localExporter: e,

 	}

 	_, err := i.opts.Load(opt)

@@ -50,7 +52,8 @@ func (e *localExporter) Resolve(ctx context.Context, id int, opt map[string]stri

 type localExporterInstance struct {

 	*localExporter

-	id int

+	id    int

+	attrs map[string]string

 	opts CreateFSOpts

 }

@@ -63,6 +66,14 @@ func (e *localExporterInstance) Name() string {

 	return "exporting to client directory"

 }

+func (e *localExporterInstance) Type() string {

+	return client.ExporterLocal

+}

+

+func (e *localExporterInstance) Attrs() map[string]string {

+	return e.attrs

+}

+

 func (e *localExporter) Config() *exporter.Config {

 	return exporter.NewConfig()

 }

@@ -14,6 +14,7 @@ import (

 	"github.com/distribution/reference"

 	"github.com/moby/buildkit/cache"

 	cacheconfig "github.com/moby/buildkit/cache/config"

+	"github.com/moby/buildkit/client"

 	"github.com/moby/buildkit/exporter"

 	"github.com/moby/buildkit/exporter/containerimage"

 	"github.com/moby/buildkit/exporter/containerimage/exptypes"

@@ -34,8 +35,8 @@ import (

 type ExporterVariant string

 const (

-	VariantOCI    = "oci"

-	VariantDocker = "docker"

+	VariantOCI    = client.ExporterOCI

+	VariantDocker = client.ExporterDocker

 )

 const (

@@ -62,6 +63,7 @@ func (e *imageExporter) Resolve(ctx context.Context, id int, opt map[string]stri

 	i := &imageExporterInstance{

 		imageExporter: e,

 		id:            id,

+		attrs:         opt,

 		tar:           true,

 		opts: containerimage.ImageCommitOpts{

 			RefCfg: cacheconfig.RefConfig{

@@ -100,7 +102,8 @@ func (e *imageExporter) Resolve(ctx context.Context, id int, opt map[string]stri

 type imageExporterInstance struct {

 	*imageExporter

-	id int

+	id    int

+	attrs map[string]string

 	opts containerimage.ImageCommitOpts

 	tar  bool

@@ -115,6 +118,14 @@ func (e *imageExporterInstance) Name() string {

 	return fmt.Sprintf("exporting to %s image format", e.opt.Variant)

 }

+func (e *imageExporterInstance) Type() string {

+	return string(e.opt.Variant)

+}

+

+func (e *imageExporterInstance) Attrs() map[string]string {

+	return e.attrs

+}

+

 func (e *imageExporterInstance) Config() *exporter.Config {

 	return exporter.NewConfigWithCompression(e.opts.RefCfg.Compression)

 }

@@ -7,6 +7,7 @@ import (

 	"time"

 	"github.com/moby/buildkit/cache"

+	"github.com/moby/buildkit/client"

 	"github.com/moby/buildkit/exporter"

 	"github.com/moby/buildkit/exporter/containerimage/exptypes"

 	"github.com/moby/buildkit/exporter/local"

@@ -37,6 +38,7 @@ func (e *localExporter) Resolve(ctx context.Context, id int, opt map[string]stri

 	li := &localExporterInstance{

 		localExporter: e,

 		id:            id,

+		attrs:         opt,

 	}

 	_, err := li.opts.Load(opt)

 	if err != nil {

@@ -49,7 +51,8 @@ func (e *localExporter) Resolve(ctx context.Context, id int, opt map[string]stri

 type localExporterInstance struct {

 	*localExporter

-	id int

+	id    int

+	attrs map[string]string

 	opts local.CreateFSOpts

 }

@@ -62,6 +65,14 @@ func (e *localExporterInstance) Name() string {

 	return "exporting to client tarball"

 }

+func (e *localExporterInstance) Type() string {

+	return client.ExporterTar

+}

+

+func (e *localExporterInstance) Attrs() map[string]string {

+	return e.attrs

+}

+

 func (e *localExporterInstance) Config() *exporter.Config {

 	return exporter.NewConfig()

 }

@@ -276,10 +276,10 @@ func toDispatchState(ctx context.Context, dt []byte, opt ConvertOpt) (*dispatchS

 		// The `dockerfile.Warnings` *should* only contain warnings about empty continuation

 		// lines, but we'll check the warning message to be sure, so that we don't accidentally

 		// process warnings that are not related to empty continuation lines twice.

-		if warning.URL == linter.RuleNoEmptyContinuations.URL {

+		if warning.URL == linter.RuleNoEmptyContinuation.URL {

 			location := []parser.Range{*warning.Location}

-			msg := linter.RuleNoEmptyContinuations.Format()

-			lint.Run(&linter.RuleNoEmptyContinuations, location, msg)

+			msg := linter.RuleNoEmptyContinuation.Format()

+			lint.Run(&linter.RuleNoEmptyContinuation, location, msg)

 		}

 	}

@@ -92,7 +92,7 @@ func (rule *LinterRule[F]) Run(warn LintWarnFunc, location []parser.Range, txt .

 }

 func LintFormatShort(rulename, msg string, startLine int) string {

-	return fmt.Sprintf("Lint Rule '%s': %s (line %d)", rulename, msg, startLine)

+	return fmt.Sprintf("%s: %s (line %d)", rulename, msg, startLine)

 }

 type LintWarnFunc func(rulename, description, url, fmtmsg string, location []parser.Range)

@@ -21,10 +21,10 @@ var (

 			return fmt.Sprintf("'%s' and '%s' keywords' casing do not match", as, from)

 		},

 	}

-	RuleNoEmptyContinuations = LinterRule[func() string]{

-		Name:        "NoEmptyContinuations",

+	RuleNoEmptyContinuation = LinterRule[func() string]{

+		Name:        "NoEmptyContinuation",

 		Description: "Empty continuation lines will become errors in a future release",

-		URL:         "https://docs.docker.com/go/dockerfile/rule/no-empty-continuations/",

+		URL:         "https://docs.docker.com/go/dockerfile/rule/no-empty-continuation/",

 		Format: func() string {

 			return "Empty continuation line"

 		},

@@ -338,7 +338,7 @@ func Parse(rwc io.Reader) (*Result, error) {

 			warnings = append(warnings, Warning{

 				Short:    "Empty continuation line found in: " + line,

 				Detail:   [][]byte{[]byte("Empty continuation lines will become errors in a future release")},

-				URL:      "https://docs.docker.com/go/dockerfile/rule/no-empty-continuations/",

+				URL:      "https://docs.docker.com/go/dockerfile/rule/no-empty-continuation/",

 				Location: &Range{Start: Position{Line: currentLine}, End: Position{Line: currentLine}},

 			})

 		}

@@ -53,8 +53,6 @@ const (

 )

 type ExporterRequest struct {

-	Type           string

-	Attrs          map[string]string

 	Exporters      []exporter.ExporterInstance

 	CacheExporters []RemoteCacheExporter

 }

@@ -173,11 +171,11 @@ func (s *Solver) recordBuildHistory(ctx context.Context, id string, req frontend

 		CreatedAt:     &st,

 	}

-	if exp.Type != "" {

-		rec.Exporters = []*controlapi.Exporter{{

-			Type:  exp.Type,

-			Attrs: exp.Attrs,

-		}}

+	for _, e := range exp.Exporters {

+		rec.Exporters = append(rec.Exporters, &controlapi.Exporter{

+			Type:  e.Type(),

+			Attrs: e.Attrs(),

+		})

 	}

 	if err := s.history.Update(ctx, &controlapi.BuildHistoryEvent{

@@ -3,7 +3,7 @@ package flightcontrol

 import (

 	"context"

 	"io"

-	"runtime"

+	"math/rand"

 	"sort"

 	"sync"

 	"time"

@@ -43,13 +43,14 @@ func (g *Group[T]) Do(ctx context.Context, key string, fn func(ctx context.Conte

 			err = errors.Wrapf(errRetryTimeout, "flightcontrol")

 			return v, err

 		}

-		runtime.Gosched()

 		if backoff > 0 {

-			time.Sleep(backoff)

-			backoff *= 2

+			backoff = time.Duration(float64(backoff) * 1.2)

 		} else {

-			backoff = time.Millisecond

+			// randomize initial backoff to avoid all goroutines retrying at once

+			//nolint:gosec // using math/rand pseudo-randomness is acceptable here

+			backoff = time.Millisecond + time.Duration(rand.Intn(1e7))*time.Nanosecond

 		}

+		time.Sleep(backoff)

 	}

 }

new file mode 100644

@@ -0,0 +1 @@

+1.21.9

@@ -421,10 +421,19 @@ Prev()   Move to the previous key.

 ```

 Each of those functions has a return signature of `(key []byte, value []byte)`.

-When you have iterated to the end of the cursor then `Next()` will return a

-`nil` key.  You must seek to a position using `First()`, `Last()`, or `Seek()`

-before calling `Next()` or `Prev()`. If you do not seek to a position then

-these functions will return a `nil` key.

+You must seek to a position using `First()`, `Last()`, or `Seek()` before calling

+`Next()` or `Prev()`. If you do not seek to a position then these functions will

+return a `nil` key.

+

+When you have iterated to the end of the cursor, then `Next()` will return a

+`nil` key and the cursor still points to the last element if present. When you

+have iterated to the beginning of the cursor, then `Prev()` will return a `nil`

+key and the cursor still points to the first element if present.

+

+If you remove key/value pairs during iteration, the cursor may automatically

+move to the next position if present in current node each time removing a key.

+When you call `c.Next()` after removing a key, it may skip one key/value pair.

+Refer to [pull/611](https://github.com/etcd-io/bbolt/pull/611) to get more detailed info.

 During iteration, if the key is non-`nil` but the value is `nil`, that means

 the key refers to a bucket rather than a value.  Use `Bucket.Bucket()` to

@@ -850,6 +859,12 @@ Here are a few things to note when evaluating and using Bolt:

   to grow. However, it's important to note that deleting large chunks of data

   will not allow you to reclaim that space on disk.

+* Removing key/values pairs in a bucket during iteration on the bucket using

+  cursor may not work properly. Each time when removing a key/value pair, the

+  cursor may automatically move to the next position if present. When users

+  call `c.Next()` after removing a key, it may skip one key/value pair.

+  Refer to https://github.com/etcd-io/bbolt/pull/611 for more detailed info.

+

   For more information on page allocation, [see this comment][page-allocation].

 [page-allocation]: https://github.com/boltdb/bolt/issues/308#issuecomment-74811638

@@ -71,7 +71,7 @@ func (c *Cursor) Last() (key []byte, value []byte) {

 	// If this is an empty page (calling Delete may result in empty pages)

 	// we call prev to find the last page that is not empty

-	for len(c.stack) > 0 && c.stack[len(c.stack)-1].count() == 0 {

+	for len(c.stack) > 1 && c.stack[len(c.stack)-1].count() == 0 {

 		c.prev()

 	}

@@ -254,6 +254,15 @@ func (c *Cursor) prev() (key []byte, value []byte, flags uint32) {

 			elem.index--

 			break

 		}

+		// If we've hit the beginning, we should stop moving the cursor,

+		// and stay at the first element, so that users can continue to

+		// iterate over the elements in reverse direction by calling `Next`.

+		// We should return nil in such case.

+		// Refer to https://github.com/etcd-io/bbolt/issues/733

+		if len(c.stack) == 1 {

+			c.first()

+			return nil, nil, 0

+		}

 		c.stack = c.stack[:i]

 	}

@@ -282,9 +282,8 @@ func (f *freelist) read(p *page) {

 	if count == 0 {

 		f.ids = nil

 	} else {

-		var ids []pgid

-		data := unsafeIndex(unsafe.Pointer(p), unsafe.Sizeof(*p), unsafe.Sizeof(ids[0]), idx)

-		unsafeSlice(unsafe.Pointer(&ids), data, count)

+		data := unsafeIndex(unsafe.Pointer(p), unsafe.Sizeof(*p), unsafe.Sizeof(pgid(0)), idx)

+		ids := unsafe.Slice((*pgid)(data), count)

 		// copy the ids, so we don't modify on the freelist page directly

 		idsCopy := make([]pgid, count)

@@ -322,15 +321,13 @@ func (f *freelist) write(p *page) error {

 		p.count = uint16(l)

 	} else if l < 0xFFFF {

 		p.count = uint16(l)

-		var ids []pgid

 		data := unsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p))

-		unsafeSlice(unsafe.Pointer(&ids), data, l)

+		ids := unsafe.Slice((*pgid)(data), l)

 		f.copyall(ids)

 	} else {

 		p.count = 0xFFFF

-		var ids []pgid

 		data := unsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p))

-		unsafeSlice(unsafe.Pointer(&ids), data, l+1)

+		ids := unsafe.Slice((*pgid)(data), l+1)

 		ids[0] = pgid(l)

 		f.copyall(ids[1:])

 	}

@@ -74,9 +74,8 @@ func (p *page) leafPageElements() []leafPageElement {

 	if p.count == 0 {

 		return nil

 	}

-	var elems []leafPageElement

 	data := unsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p))

-	unsafeSlice(unsafe.Pointer(&elems), data, int(p.count))

+	elems := unsafe.Slice((*leafPageElement)(data), int(p.count))

 	return elems

 }

@@ -91,9 +90,8 @@ func (p *page) branchPageElements() []branchPageElement {

 	if p.count == 0 {

 		return nil

 	}

-	var elems []branchPageElement

 	data := unsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p))

-	unsafeSlice(unsafe.Pointer(&elems), data, int(p.count))

+	elems := unsafe.Slice((*branchPageElement)(data), int(p.count))

 	return elems

 }

@@ -1,7 +1,6 @@

 package bbolt

 import (

-	"reflect"

 	"unsafe"

 )

@@ -26,14 +25,3 @@ func unsafeByteSlice(base unsafe.Pointer, offset uintptr, i, j int) []byte {

 	// all), so this is believed to be correct.

 	return (*[maxAllocSize]byte)(unsafeAdd(base, offset))[i:j:j]

 }

-

-// unsafeSlice modifies the data, len, and cap of a slice variable pointed to by

-// the slice parameter.  This helper should be used over other direct

-// manipulation of reflect.SliceHeader to prevent misuse, namely, converting

-// from reflect.SliceHeader to a Go slice type.

-func unsafeSlice(slice, data unsafe.Pointer, len int) {

-	s := (*reflect.SliceHeader)(slice)

-	s.Data = uintptr(data)

-	s.Cap = len

-	s.Len = len

-}

@@ -444,7 +444,7 @@ github.com/deckarep/golang-set/v2

 # github.com/dimchansky/utfbom v1.1.1

 ## explicit

 github.com/dimchansky/utfbom

-# github.com/distribution/reference v0.5.0

+# github.com/distribution/reference v0.6.0

 ## explicit; go 1.20

 github.com/distribution/reference

 # github.com/docker/distribution v2.8.3+incompatible

@@ -712,7 +712,7 @@ github.com/mitchellh/hashstructure/v2

 # github.com/mitchellh/reflectwalk v1.0.2

 ## explicit

 github.com/mitchellh/reflectwalk

-# github.com/moby/buildkit v0.14.0-rc2

+# github.com/moby/buildkit v0.14.0

 ## explicit; go 1.21

 github.com/moby/buildkit/api/services/control

 github.com/moby/buildkit/api/types

@@ -1145,8 +1145,8 @@ github.com/zmap/zlint/v3/lints/etsi

 github.com/zmap/zlint/v3/lints/mozilla

 github.com/zmap/zlint/v3/lints/rfc

 github.com/zmap/zlint/v3/util

-# go.etcd.io/bbolt v1.3.9

-## explicit; go 1.17

+# go.etcd.io/bbolt v1.3.10

+## explicit; go 1.21

 go.etcd.io/bbolt

 # go.etcd.io/etcd/client/pkg/v3 v3.5.6

 ## explicit; go 1.16