opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 00:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2160 from baude/localRuntimerename

Browse Source 
Rename localRuntime to runtime in cmd/podman
This commit is contained in:
OpenShift Merge Robot
2019-01-15 09:13:44 -08:00
committed by GitHub
parent 077156d45c 61ca8e5487
commit 6e47727d8a
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/exists.go
View File

@ -67,12 +67,12 @@ func imageExistsCmd(c *cli.Context) error {
if len(args) > 1 || len(args) < 1 {
return errors.New("you may only check for the existence of one image at a time")
}
localRuntime, err := adapter.GetRuntime(c)
runtime, err := adapter.GetRuntime(c)
if err != nil {
return errors.Wrapf(err, "could not get runtime")
}
defer localRuntime.Runtime.Shutdown(false)
if _, err := localRuntime.NewImageFromLocal(args[0]); err != nil {
defer runtime.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
if errors.Cause(err) == image.ErrNoSuchImage || err.Error() == "io.podman.ImageNotFound" {

10
cmd/podman/images.go
View File

@ -152,13 +152,13 @@ func imagesCmd(c *cli.Context) error {
return err
}
localRuntime, err := adapter.GetRuntime(c)
runtime, err := adapter.GetRuntime(c)
if err != nil {
return errors.Wrapf(err, "Could not get runtime")
}
defer localRuntime.Runtime.Shutdown(false)
defer runtime.Runtime.Shutdown(false)
if len(c.Args()) == 1 {
newImage, err = localRuntime.NewImageFromLocal(c.Args().Get(0))
newImage, err = runtime.NewImageFromLocal(c.Args().Get(0))
if err != nil {
return err
}
@ -171,7 +171,7 @@ func imagesCmd(c *cli.Context) error {
ctx := getContext()
if len(c.StringSlice("filter")) > 0 || newImage != nil {
filterFuncs, err = CreateFilterFuncs(ctx, localRuntime, c, newImage)
filterFuncs, err = CreateFilterFuncs(ctx, runtime, c, newImage)
if err != nil {
return err
}
@ -195,7 +195,7 @@ func imagesCmd(c *cli.Context) error {
children to the image once built. until buildah supports caching builds,
it will not generate these intermediate images.
*/
images, err := localRuntime.GetImages()
images, err := runtime.GetImages()
if err != nil {
return errors.Wrapf(err, "unable to get images")
}

8
cmd/podman/info.go
View File

@ -39,20 +39,20 @@ func infoCmd(c *cli.Context) error {
}
info := map[string]interface{}{}
localRuntime, err := adapter.GetRuntime(c)
runtime, err := adapter.GetRuntime(c)
if err != nil {
return errors.Wrapf(err, "could not get runtime")
}
defer localRuntime.Runtime.Shutdown(false)
defer runtime.Runtime.Shutdown(false)
infoArr, err := localRuntime.Runtime.Info()
infoArr, err := runtime.Runtime.Info()
if err != nil {
return errors.Wrapf(err, "error getting info")
}
// TODO This is no a problem child because we don't know if we should add information
// TODO about the client or the backend. Only do for traditional podman for now.
if !localRuntime.Remote && c.Bool("debug") {
if !runtime.Remote && c.Bool("debug") {
debugInfo := debugInfo(c)
infoArr = append(infoArr, libpod.InfoData{Type: "debug", Data: debugInfo})
}

8
cmd/podman/pull.go
View File

@ -64,11 +64,11 @@ specified, the image with the 'latest' tag (if it exists) is pulled
// pullCmd gets the data from the command line and calls pullImage
// to copy an image from a registry to a local machine
func pullCmd(c *cli.Context) error {
localRuntime, err := adapter.GetRuntime(c)
runtime, err := adapter.GetRuntime(c)
if err != nil {
return errors.Wrapf(err, "could not get runtime")
}
defer localRuntime.Runtime.Shutdown(false)
defer runtime.Runtime.Shutdown(false)
args := c.Args()
if len(args) == 0 {
@ -116,14 +116,14 @@ func pullCmd(c *cli.Context) error {
if err != nil {
return errors.Wrapf(err, "error parsing %q", image)
}
newImage, err := localRuntime.LoadFromArchiveReference(getContext(), srcRef, c.String("signature-policy"), writer)
newImage, err := runtime.LoadFromArchiveReference(getContext(), srcRef, c.String("signature-policy"), writer)
if err != nil {
return errors.Wrapf(err, "error pulling image from %q", image)
}
imgID = newImage[0].ID()
} else {
authfile := getAuthFile(c.String("authfile"))
newImage, err := localRuntime.New(getContext(), image, c.String("signature-policy"), authfile, writer, &dockerRegistryOptions, image2.SigningOptions{}, true)
newImage, err := runtime.New(getContext(), image, c.String("signature-policy"), authfile, writer, &dockerRegistryOptions, image2.SigningOptions{}, true)
if err != nil {
return errors.Wrapf(err, "error pulling image %q", image)
}

6
cmd/podman/tag.go
View File

@ -23,13 +23,13 @@ func tagCmd(c *cli.Context) error {
if len(args) < 2 {
return errors.Errorf("image name and at least one new name must be specified")
}
localRuntime, err := adapter.GetRuntime(c)
runtime, err := adapter.GetRuntime(c)
if err != nil {
return errors.Wrapf(err, "could not create runtime")
}
defer localRuntime.Runtime.Shutdown(false)
defer runtime.Runtime.Shutdown(false)
newImage, err := localRuntime.NewImageFromLocal(args[0])
newImage, err := runtime.NewImageFromLocal(args[0])
if err != nil {
return err
}