github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #926 from stevvooe/merge-metadata-storage

Browse Source 
metadata: merge storage into package
This commit is contained in:
Derek McGowan
2017-05-30 12:26:44 -07:00
committed by GitHub
parent 0e56c47f8c 7c14cbc091
commit a7a764adfa
12 changed files with 298 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/containerd/main.go
View File

@@ -26,8 +26,8 @@ import (
snapshotapi "github.com/containerd/containerd/api/services/snapshot"
versionapi "github.com/containerd/containerd/api/services/version"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/snapshot"
"github.com/containerd/containerd/sys"
@@ -259,8 +259,7 @@ func resolveMetaDB(ctx *cli.Context) (*bolt.DB, error) {
return nil, err
}
// TODO(stevvooe): Break these down into components to be initialized.
if err := images.InitDB(db); err != nil {
if err := metadata.InitDB(db); err != nil {
return nil, err
}