diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-15 10:27:36 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-15 10:27:36 -0800 |
commit | 1b2f75298d98f59fac73a63599cdca3478bef835 (patch) | |
tree | 414955b45a6675ed49e107e12c41778414d97798 /cmd/podman | |
parent | 6e47727d8ad7205d210b027ed03c1eb28b58ab9c (diff) | |
parent | 9a23e285d3ef7d356cb08cd431bcc6ffc7b579ab (diff) | |
download | podman-1b2f75298d98f59fac73a63599cdca3478bef835.tar.gz podman-1b2f75298d98f59fac73a63599cdca3478bef835.tar.bz2 podman-1b2f75298d98f59fac73a63599cdca3478bef835.zip |
Merge pull request #2161 from baude/remotehistory
add support for podman-remote history
Diffstat (limited to 'cmd/podman')
-rw-r--r-- | cmd/podman/history.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/history.go b/cmd/podman/history.go index 7c8c619c8..802047071 100644 --- a/cmd/podman/history.go +++ b/cmd/podman/history.go @@ -1,15 +1,15 @@ package main import ( + "github.com/containers/libpod/libpod/adapter" "reflect" "strconv" "strings" "time" "github.com/containers/libpod/cmd/podman/formats" - "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod/image" - units "github.com/docker/go-units" + "github.com/docker/go-units" "github.com/pkg/errors" "github.com/urfave/cli" ) @@ -72,11 +72,11 @@ func historyCmd(c *cli.Context) error { return err } - runtime, err := libpodruntime.GetRuntime(c) + runtime, err := adapter.GetRuntime(c) if err != nil { return errors.Wrapf(err, "could not get runtime") } - defer runtime.Shutdown(false) + defer runtime.Runtime.Shutdown(false) format := genHistoryFormat(c.String("format"), c.Bool("quiet")) @@ -88,7 +88,7 @@ func historyCmd(c *cli.Context) error { return errors.Errorf("podman history takes at most 1 argument") } - image, err := runtime.ImageRuntime().NewFromLocal(args[0]) + image, err := runtime.NewImageFromLocal(args[0]) if err != nil { return err } |