From e68f03ae45adbaa539c7470aa5f99dc870c185dc Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 15 Jan 2019 14:44:46 -0600 Subject: 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 --- cmd/podman/exists.go | 6 +++--- cmd/podman/history.go | 4 ++-- cmd/podman/images.go | 5 ++--- cmd/podman/info.go | 6 +++--- cmd/podman/pull.go | 4 ++-- cmd/podman/rmi.go | 2 +- cmd/podman/tag.go | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/exists.go b/cmd/podman/exists.go index a957e1ef7..a7601aaa2 100644 --- a/cmd/podman/exists.go +++ b/cmd/podman/exists.go @@ -71,7 +71,7 @@ func imageExistsCmd(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 _, err := runtime.NewImageFromLocal(args[0]); err != nil { //TODO we need to ask about having varlink defined errors exposed //so we can reuse them @@ -92,8 +92,8 @@ func containerExistsCmd(c *cli.Context) error { if err != nil { return errors.Wrapf(err, "could not get runtime") } - defer runtime.Runtime.Shutdown(false) - if _, err := runtime.Runtime.LookupContainer(args[0]); err != nil { + defer runtime.Shutdown(false) + if _, err := runtime.LookupContainer(args[0]); err != nil { if errors.Cause(err) == libpod.ErrNoSuchCtr || err.Error() == "io.podman.ContainerNotFound" { os.Exit(1) } diff --git a/cmd/podman/history.go b/cmd/podman/history.go index 802047071..8a9b6cd94 100644 --- a/cmd/podman/history.go +++ b/cmd/podman/history.go @@ -1,13 +1,13 @@ package main import ( - "github.com/containers/libpod/libpod/adapter" "reflect" "strconv" "strings" "time" "github.com/containers/libpod/cmd/podman/formats" + "github.com/containers/libpod/libpod/adapter" "github.com/containers/libpod/libpod/image" "github.com/docker/go-units" "github.com/pkg/errors" @@ -76,7 +76,7 @@ func historyCmd(c *cli.Context) error { if err != nil { return errors.Wrapf(err, "could not get runtime") } - defer runtime.Runtime.Shutdown(false) + defer runtime.Shutdown(false) format := genHistoryFormat(c.String("format"), c.Bool("quiet")) diff --git a/cmd/podman/images.go b/cmd/podman/images.go index 7f2fb7ae0..031f06618 100644 --- a/cmd/podman/images.go +++ b/cmd/podman/images.go @@ -8,10 +8,9 @@ import ( "time" "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/cmd/podman/formats" "github.com/containers/libpod/libpod/image" "github.com/docker/go-units" "github.com/opencontainers/go-digest" @@ -157,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 { diff --git a/cmd/podman/info.go b/cmd/podman/info.go index 1ec4011da..c33ede548 100644 --- a/cmd/podman/info.go +++ b/cmd/podman/info.go @@ -1,11 +1,11 @@ package main import ( - "github.com/containers/libpod/libpod/adapter" "runtime" "github.com/containers/libpod/cmd/podman/formats" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/adapter" "github.com/pkg/errors" "github.com/urfave/cli" ) @@ -43,9 +43,9 @@ func infoCmd(c *cli.Context) error { if err != nil { return errors.Wrapf(err, "could not get runtime") } - defer runtime.Runtime.Shutdown(false) + defer runtime.Shutdown(false) - infoArr, err := runtime.Runtime.Info() + infoArr, err := runtime.Info() if err != nil { return errors.Wrapf(err, "error getting info") } 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 { diff --git a/cmd/podman/rmi.go b/cmd/podman/rmi.go index 58a78a924..fbf860eb2 100644 --- a/cmd/podman/rmi.go +++ b/cmd/podman/rmi.go @@ -61,7 +61,7 @@ func rmiCmd(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 && !removeAll { diff --git a/cmd/podman/tag.go b/cmd/podman/tag.go index 8e92ca2fa..d19cf69a2 100644 --- a/cmd/podman/tag.go +++ b/cmd/podman/tag.go @@ -27,7 +27,7 @@ func tagCmd(c *cli.Context) error { if err != nil { return errors.Wrapf(err, "could not create runtime") } - defer runtime.Runtime.Shutdown(false) + defer runtime.Shutdown(false) newImage, err := runtime.NewImageFromLocal(args[0]) if err != nil { -- cgit v1.2.3-54-g00ecf