diff --git a/metadata/bolt.go b/metadata/bolt.go index 156a33593..6ea460866 100644 --- a/metadata/bolt.go +++ b/metadata/bolt.go @@ -19,8 +19,8 @@ package metadata import ( "context" - "github.com/boltdb/bolt" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) type transactionKey struct{} diff --git a/metadata/boltutil/helpers.go b/metadata/boltutil/helpers.go index 4b2ede876..124018857 100644 --- a/metadata/boltutil/helpers.go +++ b/metadata/boltutil/helpers.go @@ -19,8 +19,8 @@ package boltutil import ( "time" - "github.com/boltdb/bolt" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) var ( diff --git a/metadata/buckets.go b/metadata/buckets.go index fcf4c2959..6834874d0 100644 --- a/metadata/buckets.go +++ b/metadata/buckets.go @@ -17,8 +17,8 @@ package metadata import ( - "github.com/boltdb/bolt" digest "github.com/opencontainers/go-digest" + bolt "go.etcd.io/bbolt" ) // The layout where a "/" delineates a bucket is desribed in the following diff --git a/metadata/containers.go b/metadata/containers.go index 2c9726fc2..6e5622c36 100644 --- a/metadata/containers.go +++ b/metadata/containers.go @@ -21,7 +21,6 @@ import ( "strings" "time" - "github.com/boltdb/bolt" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" @@ -32,6 +31,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/types" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) type containerStore struct { diff --git a/metadata/containers_test.go b/metadata/containers_test.go index ccad0cf4b..14540d43a 100644 --- a/metadata/containers_test.go +++ b/metadata/containers_test.go @@ -27,7 +27,6 @@ import ( "testing" "time" - "github.com/boltdb/bolt" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" @@ -36,6 +35,7 @@ import ( "github.com/gogo/protobuf/types" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) func init() { diff --git a/metadata/content.go b/metadata/content.go index 7293f1bfa..088f4ba27 100644 --- a/metadata/content.go +++ b/metadata/content.go @@ -23,7 +23,6 @@ import ( "sync" "time" - "github.com/boltdb/bolt" "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" @@ -34,6 +33,7 @@ import ( digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) type contentStore struct { diff --git a/metadata/content_test.go b/metadata/content_test.go index 3645a85d5..ac42c9132 100644 --- a/metadata/content_test.go +++ b/metadata/content_test.go @@ -24,7 +24,6 @@ import ( "sync/atomic" "testing" - "github.com/boltdb/bolt" "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/local" "github.com/containerd/containerd/content/testsuite" @@ -34,6 +33,7 @@ import ( digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) func createContentStore(ctx context.Context, root string) (context.Context, content.Store, func() error, error) { diff --git a/metadata/db.go b/metadata/db.go index 0ea8ad78f..f34f5831e 100644 --- a/metadata/db.go +++ b/metadata/db.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/boltdb/bolt" "github.com/containerd/containerd/content" "github.com/containerd/containerd/gc" "github.com/containerd/containerd/log" "github.com/containerd/containerd/snapshots" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) const ( diff --git a/metadata/db_test.go b/metadata/db_test.go index 9cb34eb16..9b3a1367a 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -30,7 +30,6 @@ import ( "testing" "time" - "github.com/boltdb/bolt" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/local" @@ -44,6 +43,7 @@ import ( digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) func testDB(t *testing.T) (context.Context, *DB, func()) { diff --git a/metadata/gc.go b/metadata/gc.go index eb4d0c7c3..a670ce1a3 100644 --- a/metadata/gc.go +++ b/metadata/gc.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/boltdb/bolt" "github.com/containerd/containerd/gc" "github.com/containerd/containerd/log" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) const ( diff --git a/metadata/gc_test.go b/metadata/gc_test.go index 8505ac77c..5412133c3 100644 --- a/metadata/gc_test.go +++ b/metadata/gc_test.go @@ -27,10 +27,10 @@ import ( "testing" "time" - "github.com/boltdb/bolt" "github.com/containerd/containerd/gc" "github.com/containerd/containerd/metadata/boltutil" digest "github.com/opencontainers/go-digest" + bolt "go.etcd.io/bbolt" ) func TestGCRoots(t *testing.T) { diff --git a/metadata/images.go b/metadata/images.go index 62b1179cd..6ae9dc855 100644 --- a/metadata/images.go +++ b/metadata/images.go @@ -23,7 +23,6 @@ import ( "strings" "time" - "github.com/boltdb/bolt" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/images" @@ -33,6 +32,7 @@ import ( digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) type imageStore struct { diff --git a/metadata/leases.go b/metadata/leases.go index 8835065d1..635c3b3c3 100644 --- a/metadata/leases.go +++ b/metadata/leases.go @@ -20,7 +20,6 @@ import ( "context" "time" - "github.com/boltdb/bolt" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/leases" @@ -28,6 +27,7 @@ import ( "github.com/containerd/containerd/namespaces" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) // LeaseManager manages the create/delete lifecyle of leases diff --git a/metadata/leases_test.go b/metadata/leases_test.go index ebf728dc4..f862830e0 100644 --- a/metadata/leases_test.go +++ b/metadata/leases_test.go @@ -19,10 +19,10 @@ package metadata import ( "testing" - "github.com/boltdb/bolt" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) func TestLeases(t *testing.T) { diff --git a/metadata/migrations.go b/metadata/migrations.go index 3ffda6b3b..06c9da47d 100644 --- a/metadata/migrations.go +++ b/metadata/migrations.go @@ -16,7 +16,7 @@ package metadata -import "github.com/boltdb/bolt" +import bolt "go.etcd.io/bbolt" type migration struct { schema string diff --git a/metadata/namespaces.go b/metadata/namespaces.go index 000bef6c9..74951eb5c 100644 --- a/metadata/namespaces.go +++ b/metadata/namespaces.go @@ -19,11 +19,11 @@ package metadata import ( "context" - "github.com/boltdb/bolt" "github.com/containerd/containerd/errdefs" l "github.com/containerd/containerd/labels" "github.com/containerd/containerd/namespaces" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) type namespaceStore struct { diff --git a/metadata/snapshot.go b/metadata/snapshot.go index fda380a6a..75b80b0bc 100644 --- a/metadata/snapshot.go +++ b/metadata/snapshot.go @@ -23,7 +23,6 @@ import ( "sync" "time" - "github.com/boltdb/bolt" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/log" @@ -32,6 +31,7 @@ import ( "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/snapshots" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) type snapshotter struct { diff --git a/metadata/snapshot_test.go b/metadata/snapshot_test.go index f464acd10..e2cb3417c 100644 --- a/metadata/snapshot_test.go +++ b/metadata/snapshot_test.go @@ -23,11 +23,11 @@ import ( "runtime" "testing" - "github.com/boltdb/bolt" "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/native" "github.com/containerd/containerd/snapshots/testsuite" + bolt "go.etcd.io/bbolt" ) func newTestSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) { diff --git a/runtime/v1/linux/runtime.go b/runtime/v1/linux/runtime.go index 24322f07e..d19b8e516 100644 --- a/runtime/v1/linux/runtime.go +++ b/runtime/v1/linux/runtime.go @@ -26,7 +26,6 @@ import ( "path/filepath" "time" - "github.com/boltdb/bolt" eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/containers" @@ -49,6 +48,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" + bolt "go.etcd.io/bbolt" "golang.org/x/sys/unix" ) diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index 3827bd762..a04082dfa 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -23,7 +23,6 @@ import ( "os" "path/filepath" - "github.com/boltdb/bolt" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/log" @@ -32,6 +31,7 @@ import ( "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/runtime" + bolt "go.etcd.io/bbolt" ) func init() { diff --git a/services/containers/local.go b/services/containers/local.go index 6f4b3d4d3..95a09872e 100644 --- a/services/containers/local.go +++ b/services/containers/local.go @@ -20,7 +20,6 @@ import ( "context" "io" - "github.com/boltdb/bolt" eventstypes "github.com/containerd/containerd/api/events" api "github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/containers" @@ -30,6 +29,7 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" ptypes "github.com/gogo/protobuf/types" + bolt "go.etcd.io/bbolt" "google.golang.org/grpc" "google.golang.org/grpc/codes" grpcm "google.golang.org/grpc/metadata" diff --git a/services/leases/local.go b/services/leases/local.go index 09aff10f7..0cb310837 100644 --- a/services/leases/local.go +++ b/services/leases/local.go @@ -19,12 +19,12 @@ package leases import ( "context" - "github.com/boltdb/bolt" "github.com/containerd/containerd/gc" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" + bolt "go.etcd.io/bbolt" ) func init() { diff --git a/services/namespaces/local.go b/services/namespaces/local.go index 08d21be2b..f50b65355 100644 --- a/services/namespaces/local.go +++ b/services/namespaces/local.go @@ -20,7 +20,6 @@ import ( "context" "strings" - "github.com/boltdb/bolt" eventstypes "github.com/containerd/containerd/api/events" api "github.com/containerd/containerd/api/services/namespaces/v1" "github.com/containerd/containerd/errdefs" @@ -30,6 +29,7 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" ptypes "github.com/gogo/protobuf/types" + bolt "go.etcd.io/bbolt" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/services/server/server.go b/services/server/server.go index 3b2852e42..ed10766f3 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -29,7 +29,6 @@ import ( "sync" "time" - "github.com/boltdb/bolt" csapi "github.com/containerd/containerd/api/services/content/v1" ssapi "github.com/containerd/containerd/api/services/snapshots/v1" "github.com/containerd/containerd/content" @@ -46,6 +45,7 @@ import ( metrics "github.com/docker/go-metrics" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" "google.golang.org/grpc" ) diff --git a/services/tasks/local.go b/services/tasks/local.go index 74e7c1bee..ce9ee59d6 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -26,7 +26,6 @@ import ( "path/filepath" "time" - "github.com/boltdb/bolt" api "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/api/types/task" @@ -48,6 +47,7 @@ import ( ptypes "github.com/gogo/protobuf/types" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/snapshots/storage/bolt.go b/snapshots/storage/bolt.go index 9c589575e..7716a591e 100644 --- a/snapshots/storage/bolt.go +++ b/snapshots/storage/bolt.go @@ -23,11 +23,11 @@ import ( "strings" "time" - "github.com/boltdb/bolt" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/snapshots" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) var ( diff --git a/snapshots/storage/metastore.go b/snapshots/storage/metastore.go index fa5e6c78b..69ba3ea96 100644 --- a/snapshots/storage/metastore.go +++ b/snapshots/storage/metastore.go @@ -25,9 +25,9 @@ import ( "context" "sync" - "github.com/boltdb/bolt" "github.com/containerd/containerd/snapshots" "github.com/pkg/errors" + bolt "go.etcd.io/bbolt" ) // Transactor is used to finalize an active transaction.