diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-16 00:58:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 00:58:11 -0800 |
| commit | 81e94c9049addbbdd47bec6ea99691daee942ecd (patch) | |
| tree | 186737d7a6578d48496a25233831bc7465381e57 /cmd/podman/images.go | |
| parent | 1b2f75298d98f59fac73a63599cdca3478bef835 (diff) | |
| parent | e68f03ae45adbaa539c7470aa5f99dc870c185dc (diff) | |
| download | podman-81e94c9049addbbdd47bec6ea99691daee942ecd.tar.gz podman-81e94c9049addbbdd47bec6ea99691daee942ecd.tar.bz2 podman-81e94c9049addbbdd47bec6ea99691daee942ecd.zip | |
Merge pull request #2164 from baude/wehateruntime
podman-remote enable containers
Diffstat (limited to 'cmd/podman/images.go')
| -rw-r--r-- | cmd/podman/images.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/images.go b/cmd/podman/images.go index 2b4187a9a..031f06618 100644 --- a/cmd/podman/images.go +++ b/cmd/podman/images.go @@ -2,8 +2,6 @@ package main import ( "context" - "github.com/containers/libpod/cmd/podman/imagefilters" - "github.com/containers/libpod/libpod/adapter" "reflect" "sort" "strings" @@ -11,6 +9,8 @@ import ( "unicode" "github.com/containers/libpod/cmd/podman/formats" + "github.com/containers/libpod/cmd/podman/imagefilters" + "github.com/containers/libpod/libpod/adapter" "github.com/containers/libpod/libpod/image" "github.com/docker/go-units" "github.com/opencontainers/go-digest" @@ -156,7 +156,7 @@ func imagesCmd(c *cli.Context) error { if err != nil { return errors.Wrapf(err, "Could not get runtime") } - defer runtime.Runtime.Shutdown(false) + defer runtime.Shutdown(false) if len(c.Args()) == 1 { newImage, err = runtime.NewImageFromLocal(c.Args().Get(0)) if err != nil { |