diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/tree.go | 97 | ||||
| -rw-r--r-- | cmd/podman/varlink/io.podman.varlink | 10 |
2 files changed, 12 insertions, 95 deletions
diff --git a/cmd/podman/tree.go b/cmd/podman/tree.go index 69b42639d..28c770f0c 100644 --- a/cmd/podman/tree.go +++ b/cmd/podman/tree.go @@ -1,23 +1,14 @@ package main import ( - "context" "fmt" "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/adapter" - "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" ) -const ( - middleItem = "├── " - continueItem = "│ " - lastItem = "└── " -) - var ( treeCommand cliconfig.TreeValues @@ -56,95 +47,11 @@ func treeCmd(c *cliconfig.TreeValues) error { return errors.Wrapf(err, "error creating libpod runtime") } defer runtime.DeferredShutdown(false) - imageInfo, layerInfoMap, img, err := runtime.Tree(c.InputArgs[0]) - if err != nil { - return err - } - return printTree(imageInfo, layerInfoMap, img, c.WhatRequires) -} -func printTree(imageInfo *image.InfoImage, layerInfoMap map[string]*image.LayerInfo, img *adapter.ContainerImage, whatRequires bool) error { - size, err := img.Size(context.Background()) + tree, err := runtime.ImageTree(c.InputArgs[0], c.WhatRequires) if err != nil { return err } - - fmt.Printf("Image ID: %s\n", imageInfo.ID[:12]) - fmt.Printf("Tags:\t %s\n", imageInfo.Tags) - fmt.Printf("Size:\t %v\n", units.HumanSizeWithPrecision(float64(*size), 4)) - if img.TopLayer() != "" { - fmt.Printf("Image Layers\n") - } else { - fmt.Printf("No Image Layers\n") - } - - if !whatRequires { - // fill imageInfo with layers associated with image. - // the layers will be filled such that - // (Start)RootLayer->...intermediate Parent Layer(s)-> TopLayer(End) - // Build output from imageInfo into buffer - printImageHierarchy(imageInfo) - - } else { - // fill imageInfo with layers associated with image. - // the layers will be filled such that - // (Start)TopLayer->...intermediate Child Layer(s)-> Child TopLayer(End) - // (Forks)... intermediate Child Layer(s) -> Child Top Layer(End) - return printImageChildren(layerInfoMap, img.TopLayer(), "", true) - } - return nil -} - -// Stores all children layers which are created using given Image. -// Layers are stored as follows -// (Start)TopLayer->...intermediate Child Layer(s)-> Child TopLayer(End) -// (Forks)... intermediate Child Layer(s) -> Child Top Layer(End) -func printImageChildren(layerMap map[string]*image.LayerInfo, layerID string, prefix string, last bool) error { - if layerID == "" { - return nil - } - ll, ok := layerMap[layerID] - if !ok { - return fmt.Errorf("lookup error: layerid %s, not found", layerID) - } - fmt.Print(prefix) - - //initialize intend with middleItem to reduce middleItem checks. - intend := middleItem - if !last { - // add continueItem i.e. '|' for next iteration prefix - prefix += continueItem - } else if len(ll.ChildID) > 1 || len(ll.ChildID) == 0 { - // The above condition ensure, alignment happens for node, which has more then 1 children. - // If node is last in printing hierarchy, it should not be printed as middleItem i.e. ├── - intend = lastItem - prefix += " " - } - - var tags string - if len(ll.RepoTags) > 0 { - tags = fmt.Sprintf(" Top Layer of: %s", ll.RepoTags) - } - fmt.Printf("%sID: %s Size: %7v%s\n", intend, ll.ID[:12], units.HumanSizeWithPrecision(float64(ll.Size), 4), tags) - for count, childID := range ll.ChildID { - if err := printImageChildren(layerMap, childID, prefix, count == len(ll.ChildID)-1); err != nil { - return err - } - } + fmt.Print(tree) return nil } - -// prints the layers info of image -func printImageHierarchy(imageInfo *image.InfoImage) { - for count, l := range imageInfo.Layers { - var tags string - intend := middleItem - if len(l.RepoTags) > 0 { - tags = fmt.Sprintf(" Top Layer of: %s", l.RepoTags) - } - if count == len(imageInfo.Layers)-1 { - intend = lastItem - } - fmt.Printf("%s ID: %s Size: %7v%s\n", intend, l.ID[:12], units.HumanSizeWithPrecision(float64(l.Size), 4), tags) - } -} diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink index a0227c48c..e9792fa8f 100644 --- a/cmd/podman/varlink/io.podman.varlink +++ b/cmd/podman/varlink/io.podman.varlink @@ -1188,6 +1188,16 @@ method GetPodsByStatus(statuses: []string) -> (pods: []string) # ~~~ method ImageExists(name: string) -> (exists: int) +# ImageTree returns the image tree for the provided image name or ID +# #### Example +# ~~~ +# $ varlink call -m unix:/run/podman/io.podman/io.podman.ImageTree '{"name": "alpine"}' +# { +# "tree": "Image ID: e7d92cdc71fe\nTags: [docker.io/library/alpine:latest]\nSize: 5.861MB\nImage Layers\n└── ID: 5216338b40a7 Size: 5.857MB Top Layer of: [docker.io/library/alpine:latest]\n" +# } +# ~~~ +method ImageTree(name: string, whatRequires: bool) -> (tree: string) + # ContainerExists takes a full or partial container ID or name and returns an int as to # whether the container exists in local storage. A result of 0 means the container does # exists; whereas a result of 1 means it could not be found. |