1. docker
  2. Commit 5c20890b9b395564e18e4f8295539bcb8bf3d0de
Browse code

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

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2018/09/12 07:12:55
Showing 7 changed files
builder/builder-next/adapters/snapshot/layer.go
History View file @ 5c20890
... ... 
@@ -5,10 +5,10 @@ import (
5 5 
 	"os"
6 6 
 	"path/filepath"
7 7
8 
-	"github.com/boltdb/bolt"
9 8 
 	"github.com/docker/docker/layer"
10 9 
 	"github.com/docker/docker/pkg/ioutils"
11 10 
 	"github.com/pkg/errors"
11 
+	bolt "go.etcd.io/bbolt"
12 12 
 	"golang.org/x/sync/errgroup"
13 13 
 )
14 14
builder/builder-next/adapters/snapshot/snapshot.go
History View file @ 5c20890
... ... 
@@ -7,7 +7,6 @@ import (
7 7 
 	"strings"
8 8 
 	"sync"
9 9
10 
-	"github.com/boltdb/bolt"
11 10 
 	"github.com/containerd/containerd/mount"
12 11 
 	"github.com/containerd/containerd/snapshots"
13 12 
 	"github.com/docker/docker/daemon/graphdriver"
... ... 
@@ -16,6 +15,7 @@ import (
16 16 
 	"github.com/moby/buildkit/snapshot"
17 17 
 	digest "github.com/opencontainers/go-digest"
18 18 
 	"github.com/pkg/errors"
19 
+	bolt "go.etcd.io/bbolt"
19 20 
 )
20 21
21 22 
 var keyParent = []byte("parent")
builder/fscache/fscache.go
History View file @ 5c20890
... ... 
@@ -12,7 +12,6 @@ import (
12 12 
 	"sync"
13 13 
 	"time"
14 14
15 
-	"github.com/boltdb/bolt"
16 15 
 	"github.com/docker/docker/builder"
17 16 
 	"github.com/docker/docker/builder/remotecontext"
18 17 
 	"github.com/docker/docker/pkg/archive"
... ... 
@@ -23,6 +22,7 @@ import (
23 23 
 	"github.com/pkg/errors"
24 24 
 	"github.com/sirupsen/logrus"
25 25 
 	"github.com/tonistiigi/fsutil"
26 
+	bolt "go.etcd.io/bbolt"
26 27 
 	"golang.org/x/sync/singleflight"
27 28 
 )
28 29
volume/service/db.go
History View file @ 5c20890
... ... 
@@ -3,10 +3,10 @@ package service // import "github.com/docker/docker/volume/service"
3 3 
 import (
4 4 
 	"encoding/json"
5 5
6 
-	"github.com/boltdb/bolt"
7 6 
 	"github.com/docker/docker/errdefs"
8 7 
 	"github.com/pkg/errors"
9 8 
 	"github.com/sirupsen/logrus"
9 
+	bolt "go.etcd.io/bbolt"
10 10 
 )
11 11
12 12 
 var volumeBucketName = []byte("volumes")
volume/service/db_test.go
History View file @ 5c20890
... ... 
@@ -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 
 )
volume/service/restore.go
History View file @ 5c20890
... ... 
@@ -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.
volume/service/store.go
History View file @ 5c20890
... ... 
@@ -12,7 +12,6 @@ import (
12 12
13 13 
 	"github.com/pkg/errors"
14 14
15 
-	"github.com/boltdb/bolt"
16 15 
 	"github.com/docker/docker/errdefs"
17 16 
 	"github.com/docker/docker/pkg/locker"
18 17 
 	"github.com/docker/docker/volume"
... ... 
@@ -20,6 +19,7 @@ import (
20 20 
 	volumemounts "github.com/docker/docker/volume/mounts"
21 21 
 	"github.com/docker/docker/volume/service/opts"
22 22 
 	"github.com/sirupsen/logrus"
23 
+	bolt "go.etcd.io/bbolt"
23 24 
 )
24 25
25 26 
 const (