boltdb/bolt --> go.etcd.io/bbolt

John Howard · John Howard · commit 5c20890b9b39 · 2018-09-13T12:38:39.000-07:00
Signed-off-by: John Howard &lt;jhoward@microsoft.com&gt;
diff --git a/builder/builder-next/adapters/snapshot/layer.go b/builder/builder-next/adapters/snapshot/layer.go
@@ -5,10 +5,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/boltdb/bolt"
 	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/pkg/errors"
+	bolt "go.etcd.io/bbolt"
 	"golang.org/x/sync/errgroup"
 )
 
diff --git a/builder/builder-next/adapters/snapshot/snapshot.go b/builder/builder-next/adapters/snapshot/snapshot.go
@@ -7,7 +7,6 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/boltdb/bolt"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/docker/docker/daemon/graphdriver"
@@ -16,6 +15,7 @@ import (
 	"github.com/moby/buildkit/snapshot"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
+	bolt "go.etcd.io/bbolt"
 )
 
 var keyParent = []byte("parent")
diff --git a/builder/fscache/fscache.go b/builder/fscache/fscache.go
@@ -12,7 +12,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/boltdb/bolt"
 	"github.com/docker/docker/builder"
 	"github.com/docker/docker/builder/remotecontext"
 	"github.com/docker/docker/pkg/archive"
@@ -23,6 +22,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/tonistiigi/fsutil"
+	bolt "go.etcd.io/bbolt"
 	"golang.org/x/sync/singleflight"
 )
 
diff --git a/volume/service/db.go b/volume/service/db.go
@@ -3,10 +3,10 @@ package service // import "github.com/docker/docker/volume/service"
 import (
 	"encoding/json"
 
-	"github.com/boltdb/bolt"
 	"github.com/docker/docker/errdefs"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	bolt "go.etcd.io/bbolt"
 )
 
 var volumeBucketName = []byte("volumes")
diff --git a/volume/service/db_test.go b/volume/service/db_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/boltdb/bolt"
+	bolt "go.etcd.io/bbolt"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 )
diff --git a/volume/service/restore.go b/volume/service/restore.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"sync"
 
-	"github.com/boltdb/bolt"
 	"github.com/docker/docker/volume"
 	"github.com/sirupsen/logrus"
+	bolt "go.etcd.io/bbolt"
 )
 
 // restore is called when a new volume store is created.
diff --git a/volume/service/store.go b/volume/service/store.go
@@ -12,14 +12,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/boltdb/bolt"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/locker"
 	"github.com/docker/docker/volume"
 	"github.com/docker/docker/volume/drivers"
 	volumemounts "github.com/docker/docker/volume/mounts"
 	"github.com/docker/docker/volume/service/opts"
 	"github.com/sirupsen/logrus"
+	bolt "go.etcd.io/bbolt"
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"testing"`
`8`	`8`	`"time"`
`9`	`9`
`10`		`- "github.com/boltdb/bolt"`
	`10`	`+ bolt "go.etcd.io/bbolt"`
`11`	`11`	`"gotest.tools/assert"`
`12`	`12`	`is "gotest.tools/assert/cmp"`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"sync"`
`6`	`6`
`7`		`- "github.com/boltdb/bolt"`
`8`	`7`	`"github.com/docker/docker/volume"`
`9`	`8`	`"github.com/sirupsen/logrus"`
	`9`	`+ bolt "go.etcd.io/bbolt"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// restore is called when a new volume store is created.`