From 5c20890b9b395564e18e4f8295539bcb8bf3d0de Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 11 Sep 2018 15:12:55 -0700 Subject: [PATCH] boltdb/bolt --> go.etcd.io/bbolt Signed-off-by: John Howard --- builder/builder-next/adapters/snapshot/layer.go | 2 +- builder/builder-next/adapters/snapshot/snapshot.go | 2 +- builder/fscache/fscache.go | 2 +- volume/service/db.go | 2 +- volume/service/db_test.go | 2 +- volume/service/restore.go | 2 +- volume/service/store.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builder/builder-next/adapters/snapshot/layer.go b/builder/builder-next/adapters/snapshot/layer.go index d0aa6f28fa..ffde5eec51 100644 --- 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 index d8efb759c2..e5e6942653 100644 --- 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 index 92c3ea4adb..2216c338b7 100644 --- 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 index 3b31f7bf14..d48ae544a4 100644 --- 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 index 4cac9176b7..8b6295adfd 100644 --- 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 index 55c66c4f42..6741f9ec5f 100644 --- 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 index e7e9d8a320..69a6c7bec9 100644 --- a/volume/service/store.go +++ b/volume/service/store.go @@ -12,7 +12,6 @@ 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" @@ -20,6 +19,7 @@ import ( volumemounts "github.com/docker/docker/volume/mounts" "github.com/docker/docker/volume/service/opts" "github.com/sirupsen/logrus" + bolt "go.etcd.io/bbolt" ) const (