vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #720 from 14rcole/containerserver-integration

Browse source 
Move functions in libkpod to ContainerServer
This commit is contained in:
Mrunal Patel 2017-08-07 08:09:53 -07:00 • committed by GitHub
commit 3b888a54d3
3 changed files with 39 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/kpod/inspect.go
View file

@ -81,7 +81,7 @@ func inspectCmd(c *cli.Context) error {
if err != nil {
return errors.Wrapf(err, "Could not get config")
}
store, err := getStore(config)
server, err := libkpod.New(config)
if err != nil {
return err
}
@ -89,19 +89,19 @@ func inspectCmd(c *cli.Context) error {
var data interface{}
switch itemType {
case inspectTypeContainer:
data, err = libkpod.GetContainerData(store, name, size)
data, err = server.GetContainerData(name, size)
if err != nil {
return errors.Wrapf(err, "error parsing container data")
}
case inspectTypeImage:
data, err = libkpodimage.GetImageData(store, name)
data, err = libkpodimage.GetImageData(server.Store(), name)
if err != nil {
return errors.Wrapf(err, "error parsing image data")
}
case inspectAll:
ctrData, err := libkpod.GetContainerData(store, name, size)
ctrData, err := server.GetContainerData(name, size)
if err != nil {
imgData, err := libkpodimage.GetImageData(store, name)
imgData, err := libkpodimage.GetImageData(server.Store(), name)
if err != nil {
return errors.Wrapf(err, "error parsing image data")
}