Embed runtime struct in super localRuntime

We clean up the code by eliminating stuttering references when we embed
the runtime struct into localRuntime.  Makes for less change in the future
as well.

++ jhonce

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2019-01-15 14:44:46 -06:00
parent 341f91da48
commit e68f03ae45
9 changed files with 34 additions and 39 deletions

View File

@@ -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 {