diff options
| author | baude <bbaude@redhat.com> | 2018-03-15 10:06:49 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-03-20 16:20:12 +0000 |
| commit | 38a1b2f16d210525eafcc845e7a9cce598207113 (patch) | |
| tree | 5616a12d68ebe55138fbde85f936a6bc90d4c8fd /cmd/podman/history.go | |
| parent | ecfa321288f10b70a59166f93296c77d262317fc (diff) | |
| download | podman-38a1b2f16d210525eafcc845e7a9cce598207113.tar.gz podman-38a1b2f16d210525eafcc845e7a9cce598207113.tar.bz2 podman-38a1b2f16d210525eafcc845e7a9cce598207113.zip | |
Image library stage 4 - create and commit
Migrate the podman create and commit subcommandis to leverage the images library. I also had
to migrate the cmd/ portions of run and rmi.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #498
Approved by: mheon
Diffstat (limited to 'cmd/podman/history.go')
| -rw-r--r-- | cmd/podman/history.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cmd/podman/history.go b/cmd/podman/history.go index 1164555d3..0f9698f4f 100644 --- a/cmd/podman/history.go +++ b/cmd/podman/history.go @@ -98,8 +98,11 @@ func historyCmd(c *cli.Context) error { if len(args) > 1 { return errors.Errorf("podman history takes at most 1 argument") } - imgName := args[0] + image, err := runtime.ImageRuntime().NewFromLocal(args[0]) + if err != nil { + return err + } opts := historyOptions{ human: c.BoolT("human"), noTrunc: c.Bool("no-trunc"), @@ -107,12 +110,12 @@ func historyCmd(c *cli.Context) error { format: format, } - history, layers, imageID, err := runtime.GetHistory(imgName) + history, layers, err := image.History() if err != nil { - return errors.Wrapf(err, "error getting history of image %q", imgName) + return errors.Wrapf(err, "error getting history of image %q", image.InputName) } - return generateHistoryOutput(history, layers, imageID, opts) + return generateHistoryOutput(history, layers, image.ID(), opts) } func genHistoryFormat(format string, quiet bool) string { |