@@ -133,6 +133,8 @@ linters-settings:

         alias: c8dimages

       - pkg: github.com/opencontainers/image-spec/specs-go/v1

         alias: ocispec

+      - pkg: go.etcd.io/bbolt

+        alias: bolt

       # Enforce that gotest.tools/v3/assert/cmp is always aliased as "is"

       - pkg: gotest.tools/v3/assert/cmp

         alias: is

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

 	"github.com/moby/buildkit/worker/containerd"

 	"github.com/moby/buildkit/worker/label"

 	"github.com/pkg/errors"

-	"go.etcd.io/bbolt"

 	bolt "go.etcd.io/bbolt"

 	"go.opentelemetry.io/otel/sdk/trace"

 	"tags.cncf.io/container-device-interface/pkg/cdi"

@@ -208,7 +207,7 @@ func newSnapshotterController(ctx context.Context, rt http.RoundTripper, opt Opt

 }

 func openHistoryDB(root string, fn string, cfg *config.BuilderHistoryConfig) (*bolt.DB, *bkconfig.HistoryConfig, error) {

-	db, err := bbolt.Open(filepath.Join(root, fn), 0o600, nil)

+	db, err := bolt.Open(filepath.Join(root, fn), 0o600, nil)

 	if err != nil {

 		return nil, nil, err

 	}

@@ -17,7 +17,7 @@ import (

 	"github.com/opencontainers/go-digest"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

-	"go.etcd.io/bbolt"

+	bolt "go.etcd.io/bbolt"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

@@ -282,7 +282,7 @@ func newTestDB(ctx context.Context, t testing.TB) *metadata.DB {

 	t.Helper()

 	p := filepath.Join(t.TempDir(), "metadata")

-	bdb, err := bbolt.Open(p, 0o600, &bbolt.Options{})

+	bdb, err := bolt.Open(p, 0o600, &bolt.Options{})

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -13,14 +13,14 @@ import (

 	"github.com/opencontainers/go-digest"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

 	"github.com/pkg/errors"

-	"go.etcd.io/bbolt"

+	bolt "go.etcd.io/bbolt"

 )

 func (daemon *Daemon) configureLocalContentStore(ns string) (*namespacedContent, *namespacedLeases, error) {

 	if err := os.MkdirAll(filepath.Join(daemon.root, "content"), 0o700); err != nil {

 		return nil, nil, errors.Wrap(err, "error creating dir for content store")

 	}

-	db, err := bbolt.Open(filepath.Join(daemon.root, "content", "metadata.db"), 0o600, nil)

+	db, err := bolt.Open(filepath.Join(daemon.root, "content", "metadata.db"), 0o600, nil)

 	if err != nil {

 		return nil, nil, errors.Wrap(err, "error opening bolt db for content metadata store")

 	}

@@ -78,7 +78,7 @@ import (

 	"github.com/moby/sys/user"

 	"github.com/moby/sys/userns"

 	"github.com/pkg/errors"

-	"go.etcd.io/bbolt"

+	bolt "go.etcd.io/bbolt"

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

 	"go.opentelemetry.io/otel"

 	"golang.org/x/sync/semaphore"

@@ -146,7 +146,7 @@ type Daemon struct {

 	// This is used for Windows which doesn't currently support running on containerd

 	// It stores metadata for the content store (used for manifest caching)

 	// This needs to be closed on daemon exit

-	mdDB *bbolt.DB

+	mdDB *bolt.DB

 	usesSnapshotter bool

 }

@@ -15,7 +15,7 @@ import (

 	"github.com/docker/docker/image"

 	"github.com/opencontainers/go-digest"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

-	"go.etcd.io/bbolt"

+	bolt "go.etcd.io/bbolt"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

 )

@@ -26,10 +26,10 @@ func setupTestStores(t *testing.T) (context.Context, content.Store, *imageStoreW

 	backend, err := image.NewFSStoreBackend(filepath.Join(dir, "images"))

 	assert.NilError(t, err)

-	is, err := image.NewImageStore(backend, nil)

+	imgStore, err := image.NewImageStore(backend, nil)

 	assert.NilError(t, err)

-	db, err := bbolt.Open(filepath.Join(dir, "metadata.db"), 0o600, nil)

+	db, err := bolt.Open(filepath.Join(dir, "metadata.db"), 0o600, nil)

 	assert.NilError(t, err)

 	cs, err := local.NewStore(filepath.Join(dir, "content"))

@@ -41,7 +41,7 @@ func setupTestStores(t *testing.T) (context.Context, content.Store, *imageStoreW

 		assert.Check(t, os.RemoveAll(dir))

 	}

 	ctx := namespaces.WithNamespace(context.Background(), t.Name())

-	images := &imageStoreWithLease{Store: is, ns: t.Name(), leases: metadata.NewLeaseManager(mdb)}

+	images := &imageStoreWithLease{Store: imgStore, ns: t.Name(), leases: metadata.NewLeaseManager(mdb)}

 	return ctx, cs, images, cleanup

 }