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/pull.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/pull.go')
| -rw-r--r-- | cmd/podman/pull.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go index d81457c67..2a78d0c54 100644 --- a/cmd/podman/pull.go +++ b/cmd/podman/pull.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "github.com/containers/libpod/libpod/adapter" "io" "os" "strings" @@ -10,6 +9,7 @@ import ( dockerarchive "github.com/containers/image/docker/archive" "github.com/containers/image/transports/alltransports" "github.com/containers/image/types" + "github.com/containers/libpod/libpod/adapter" image2 "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/util" "github.com/pkg/errors" @@ -68,7 +68,7 @@ func pullCmd(c *cli.Context) error { if err != nil { return errors.Wrapf(err, "could not get runtime") } - defer runtime.Runtime.Shutdown(false) + defer runtime.Shutdown(false) args := c.Args() if len(args) == 0 { |