cleanup vendor

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>

Gopkg.toml

@@ -87,8 +87,7 @@
   branch = "master"
 
 [[override]]
-  name = "github.com/boltdb/bolt"
-#source = "github.com/coreos/bbolt"
+  name = "go.etcd.io/bbolt"
   branch = "master"
 
 [[constraint]]

client/controller.go

@@ -9,7 +9,7 @@ import (
 	"github.com/moby/buildkit/frontend/dockerfile/builder"
 	"github.com/moby/buildkit/frontend/gateway"
 	"github.com/moby/buildkit/frontend/gateway/forwarder"
-	"github.com/moby/buildkit/solver/boltdbcachestorage"
+	"github.com/moby/buildkit/solver/bboltcachestorage"
 	"github.com/moby/buildkit/worker"
 	"github.com/moby/buildkit/worker/base"
 )
@@ -43,7 +43,7 @@ func (c *Client) createController() error {
 	frontends["gateway.v0"] = gateway.NewGatewayFrontend(wc)
 
 	// Create the cache storage
-	cacheStorage, err := boltdbcachestorage.NewStore(filepath.Join(c.root, "cache.db"))
+	cacheStorage, err := bboltcachestorage.NewStore(filepath.Join(c.root, "cache.db"))
 	if err != nil {
 		return err
 	}

client/list.go

@@ -7,11 +7,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/boltdb/bolt"
 	"github.com/containerd/containerd/content/local"
 	"github.com/containerd/containerd/images"
 	ctdmetadata "github.com/containerd/containerd/metadata"
 	"github.com/containerd/containerd/platforms"
+	bolt "go.etcd.io/bbolt"
 )
 
 // ListedImage represents an image structure returuned from ListImages.

client/workeropt.go

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/boltdb/bolt"
 	"github.com/containerd/containerd/content/local"
 	"github.com/containerd/containerd/diff/apply"
 	"github.com/containerd/containerd/diff/walking"
@@ -27,6 +26,7 @@ import (
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/opencontainers/runc/libcontainer/system"
 	"github.com/sirupsen/logrus"
+	bolt "go.etcd.io/bbolt"
 )
 
 // createWorkerOpt creates a base.WorkerOpt to be used for a new worker.