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

Continue switching from libkpod to libpod

Browse source 
Refactored rmi, images, diff, and history.
Made fixes to kpod images in the way it was handing the templates as well as printing the image names

Signed-off-by: umohnani8 <umohnani@redhat.com>
This commit is contained in:
umohnani8 2017-09-21 15:21:56 -04:00
parent cfd7aec1c3
commit 356df5d18e
18 changed files with 820 additions and 837 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cmd/kpod/diff.go
View file

@ -2,9 +2,9 @@ package main
import (
"fmt"
"github.com/containers/storage/pkg/archive"
"github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
"github.com/kubernetes-incubator/cri-o/libkpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
@ -74,25 +74,22 @@ func formatJSON(output []diffOutputParams) (diffJSONOutput, error) {
}
func diffCmd(c *cli.Context) error {
if len(c.Args()) != 1 {
return errors.Errorf("container, layer, or image name must be specified: kpod diff [options [...]] ID-NAME")
}
if err := validateFlags(c, diffFlags); err != nil {
return err
}
config, err := getConfig(c)
if err != nil {
return errors.Wrapf(err, "could not get config")
if len(c.Args()) != 1 {
return errors.Errorf("container, image, or layer name must be specified: kpod diff [options [...]] ID-NAME")
}
server, err := libkpod.New(config)
runtime, err := getRuntime(c)
if err != nil {
return errors.Wrapf(err, "could not get container server")
return errors.Wrapf(err, "could not get runtime")
}
defer server.Shutdown()
defer runtime.Shutdown(false)
to := c.Args().Get(0)
changes, err := server.GetDiff("", to)
changes, err := runtime.GetDiff("", to)
if err != nil {
return errors.Wrapf(err, "could not get changes for %q", to)
}