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

Merge pull request #555 from stevvooe/remove-cli-dependence-content-store-main

Browse Source 
cmd/containerd: remove cli.Context dependence for content.Store
This commit is contained in:
Stephen Day
2017-02-21 16:13:10 -08:00
committed by GitHub
parent 8ae905b92b baa307cd4b
commit b7805198b1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/containerd/main.go
View File

@@ -90,17 +90,16 @@ func main() {
} }
serveMetricsAPI() serveMetricsAPI()
contentStore, err := resolveContentStore(context) contentStore, err := resolveContentStore()
if err != nil { if err != nil {
return err return err
} }
contentService := content.NewService(contentStore)
// start the GRPC api with the execution service registered // start the GRPC api with the execution service registered
server := newGRPCServer() server := newGRPCServer()
api.RegisterContainerServiceServer(server, execution.New(supervisor)) api.RegisterContainerServiceServer(server, execution.New(supervisor))
contentapi.RegisterContentServer(server, contentService) contentapi.RegisterContentServer(server, content.NewService(contentStore))
// start the GRPC api with registered services // start the GRPC api with registered services
if err := serveGRPC(server); err != nil { if err := serveGRPC(server); err != nil {
@@ -204,7 +203,7 @@ func serveDebugAPI() error {
return nil return nil
} }
func resolveContentStore(context *cli.Context) (*content.Store, error) { func resolveContentStore() (*content.Store, error) {
cp := filepath.Join(conf.Root, "content") cp := filepath.Join(conf.Root, "content")
return content.NewStore(cp) return content.NewStore(cp)
} }