summaryrefslogtreecommitdiff
path: root/cmd/podmanV2/images
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/podmanV2/images')
-rw-r--r--cmd/podmanV2/images/exists.go40
-rw-r--r--cmd/podmanV2/images/history.go76
-rw-r--r--cmd/podmanV2/images/image.go6
-rw-r--r--cmd/podmanV2/images/images.go31
-rw-r--r--cmd/podmanV2/images/inspect.go2
-rw-r--r--cmd/podmanV2/images/list.go212
-rw-r--r--cmd/podmanV2/images/rm.go70
-rw-r--r--cmd/podmanV2/images/rmi.go30
8 files changed, 425 insertions, 42 deletions
diff --git a/cmd/podmanV2/images/exists.go b/cmd/podmanV2/images/exists.go
new file mode 100644
index 000000000..d35d6825e
--- /dev/null
+++ b/cmd/podmanV2/images/exists.go
@@ -0,0 +1,40 @@
+package images
+
+import (
+ "os"
+
+ "github.com/containers/libpod/cmd/podmanV2/registry"
+ "github.com/containers/libpod/pkg/domain/entities"
+ "github.com/spf13/cobra"
+)
+
+var (
+ existsCmd = &cobra.Command{
+ Use: "exists IMAGE",
+ Short: "Check if an image exists in local storage",
+ Long: `If the named image exists in local storage, podman image exists exits with 0, otherwise the exit code will be 1.`,
+ Args: cobra.ExactArgs(1),
+ RunE: exists,
+ Example: `podman image exists ID
+ podman image exists IMAGE && podman pull IMAGE`,
+ }
+)
+
+func init() {
+ registry.Commands = append(registry.Commands, registry.CliCommand{
+ Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+ Command: existsCmd,
+ Parent: imageCmd,
+ })
+}
+
+func exists(cmd *cobra.Command, args []string) error {
+ found, err := registry.ImageEngine().Exists(registry.GetContext(), args[0])
+ if err != nil {
+ return err
+ }
+ if !found.Value {
+ os.Exit(1)
+ }
+ return nil
+}
diff --git a/cmd/podmanV2/images/history.go b/cmd/podmanV2/images/history.go
index c75ae6ddc..f6f15e2f2 100644
--- a/cmd/podmanV2/images/history.go
+++ b/cmd/podmanV2/images/history.go
@@ -4,12 +4,15 @@ import (
"context"
"fmt"
"os"
+ "strings"
"text/tabwriter"
"text/template"
+ "time"
"github.com/containers/libpod/cmd/podmanV2/registry"
"github.com/containers/libpod/cmd/podmanV2/report"
"github.com/containers/libpod/pkg/domain/entities"
+ jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
@@ -29,14 +32,14 @@ var (
PersistentPreRunE: preRunE,
RunE: history,
}
-)
-var cmdFlags = struct {
- Human bool
- NoTrunc bool
- Quiet bool
- Format string
-}{}
+ opts = struct {
+ human bool
+ noTrunc bool
+ quiet bool
+ format string
+ }{}
+)
func init() {
registry.Commands = append(registry.Commands, registry.CliCommand{
@@ -46,12 +49,13 @@ func init() {
historyCmd.SetHelpTemplate(registry.HelpTemplate())
historyCmd.SetUsageTemplate(registry.UsageTemplate())
+
flags := historyCmd.Flags()
- flags.StringVar(&cmdFlags.Format, "format", "", "Change the output to JSON or a Go template")
- flags.BoolVarP(&cmdFlags.Human, "human", "H", true, "Display sizes and dates in human readable format")
- flags.BoolVar(&cmdFlags.NoTrunc, "no-trunc", false, "Do not truncate the output")
- flags.BoolVar(&cmdFlags.NoTrunc, "notruncate", false, "Do not truncate the output")
- flags.BoolVarP(&cmdFlags.Quiet, "quiet", "q", false, "Display the numeric IDs only")
+ flags.StringVar(&opts.format, "format", "", "Change the output to JSON or a Go template")
+ flags.BoolVarP(&opts.human, "human", "H", false, "Display sizes and dates in human readable format")
+ flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate the output")
+ flags.BoolVar(&opts.noTrunc, "notruncate", false, "Do not truncate the output")
+ flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Display the numeric IDs only")
}
func history(cmd *cobra.Command, args []string) error {
@@ -60,11 +64,51 @@ func history(cmd *cobra.Command, args []string) error {
return err
}
- row := "{{slice $x.ID 0 12}}\t{{toRFC3339 $x.Created}}\t{{ellipsis $x.CreatedBy 45}}\t{{$x.Size}}\t{{$x.Comment}}\n"
- if cmdFlags.Human {
- row = "{{slice $x.ID 0 12}}\t{{toHumanDuration $x.Created}}\t{{ellipsis $x.CreatedBy 45}}\t{{toHumanSize $x.Size}}\t{{$x.Comment}}\n"
+ if opts.format == "json" {
+ var err error
+ if len(results.Layers) == 0 {
+ _, err = fmt.Fprintf(os.Stdout, "[]\n")
+ } else {
+ // ah-hoc change to "Created": type and format
+ type layer struct {
+ entities.ImageHistoryLayer
+ Created string `json:"Created"`
+ }
+
+ layers := make([]layer, len(results.Layers))
+ for i, l := range results.Layers {
+ layers[i].ImageHistoryLayer = l
+ layers[i].Created = time.Unix(l.Created, 0).Format(time.RFC3339)
+ }
+ json := jsoniter.ConfigCompatibleWithStandardLibrary
+ enc := json.NewEncoder(os.Stdout)
+ err = enc.Encode(layers)
+ }
+ return err
+ }
+
+ // Defaults
+ hdr := "ID\tCREATED\tCREATED BY\tSIZE\tCOMMENT\n"
+ row := "{{slice .ID 0 12}}\t{{humanDuration .Created}}\t{{ellipsis .CreatedBy 45}}\t{{.Size}}\t{{.Comment}}\n"
+
+ if len(opts.format) > 0 {
+ hdr = ""
+ row = opts.format
+ if !strings.HasSuffix(opts.format, "\n") {
+ row += "\n"
+ }
+ } else {
+ switch {
+ case opts.human:
+ row = "{{slice .ID 0 12}}\t{{humanDuration .Created}}\t{{ellipsis .CreatedBy 45}}\t{{humanSize .Size}}\t{{.Comment}}\n"
+ case opts.noTrunc:
+ row = "{{.ID}}\t{{humanDuration .Created}}\t{{.CreatedBy}}\t{{humanSize .Size}}\t{{.Comment}}\n"
+ case opts.quiet:
+ hdr = ""
+ row = "{{.ID}}\n"
+ }
}
- format := "{{range $y, $x := . }}" + row + "{{end}}"
+ format := hdr + "{{range . }}" + row + "{{end}}"
tmpl := template.Must(template.New("report").Funcs(report.PodmanTemplateFuncs()).Parse(format))
w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
diff --git a/cmd/podmanV2/images/image.go b/cmd/podmanV2/images/image.go
index a15c3e826..9fc7b21d1 100644
--- a/cmd/podmanV2/images/image.go
+++ b/cmd/podmanV2/images/image.go
@@ -28,6 +28,8 @@ func init() {
}
func preRunE(cmd *cobra.Command, args []string) error {
- _, err := registry.NewImageEngine(cmd, args)
- return err
+ if _, err := registry.NewImageEngine(cmd, args); err != nil {
+ return err
+ }
+ return nil
}
diff --git a/cmd/podmanV2/images/images.go b/cmd/podmanV2/images/images.go
index a1e56396a..f248aa65f 100644
--- a/cmd/podmanV2/images/images.go
+++ b/cmd/podmanV2/images/images.go
@@ -9,17 +9,16 @@ import (
)
var (
- // podman _images_
+ // podman _images_ Alias for podman image _list_
imagesCmd = &cobra.Command{
- Use: strings.Replace(listCmd.Use, "list", "images", 1),
- Short: listCmd.Short,
- Long: listCmd.Long,
- PersistentPreRunE: preRunE,
- RunE: images,
- Example: strings.Replace(listCmd.Example, "podman image list", "podman images", -1),
+ Use: strings.Replace(listCmd.Use, "list", "images", 1),
+ Args: listCmd.Args,
+ Short: listCmd.Short,
+ Long: listCmd.Long,
+ PreRunE: listCmd.PreRunE,
+ RunE: listCmd.RunE,
+ Example: strings.Replace(listCmd.Example, "podman image list", "podman images", -1),
}
-
- imagesOpts = entities.ImageListOptions{}
)
func init() {
@@ -30,17 +29,5 @@ func init() {
imagesCmd.SetHelpTemplate(registry.HelpTemplate())
imagesCmd.SetUsageTemplate(registry.UsageTemplate())
- flags := imagesCmd.Flags()
- flags.BoolVarP(&imagesOpts.All, "all", "a", false, "Show all images (default hides intermediate images)")
- flags.BoolVar(&imagesOpts.Digests, "digests", false, "Show digests")
- flags.StringSliceVarP(&imagesOpts.Filter, "filter", "f", []string{}, "Filter output based on conditions provided (default [])")
- flags.StringVar(&imagesOpts.Format, "format", "", "Change the output format to JSON or a Go template")
- flags.BoolVarP(&imagesOpts.Noheading, "noheading", "n", false, "Do not print column headings")
- // TODO Need to learn how to deal with second name being a string instead of a char.
- // This needs to be "no-trunc, notruncate"
- flags.BoolVar(&imagesOpts.NoTrunc, "no-trunc", false, "Do not truncate output")
- flags.BoolVar(&imagesOpts.NoTrunc, "notruncate", false, "Do not truncate output")
- flags.BoolVarP(&imagesOpts.Quiet, "quiet", "q", false, "Display only image IDs")
- flags.StringVar(&imagesOpts.Sort, "sort", "created", "Sort by created, id, repository, size, or tag")
- flags.BoolVarP(&imagesOpts.History, "history", "", false, "Display the image name history")
+ imageListFlagSet(imagesCmd.Flags())
}
diff --git a/cmd/podmanV2/images/inspect.go b/cmd/podmanV2/images/inspect.go
index 2ecbbb201..f8fd44571 100644
--- a/cmd/podmanV2/images/inspect.go
+++ b/cmd/podmanV2/images/inspect.go
@@ -52,7 +52,7 @@ func init() {
flags.BoolVarP(&inspectOpts.Size, "size", "s", false, "Display total file size")
flags.StringVarP(&inspectOpts.Format, "format", "f", "", "Change the output format to a Go template")
- if registry.EngineOpts.EngineMode == entities.ABIMode {
+ if registry.EngineOptions.EngineMode == entities.ABIMode {
// TODO: This is the same as V1. We could skip creating the flag altogether in V2...
_ = flags.MarkHidden("latest")
}
diff --git a/cmd/podmanV2/images/list.go b/cmd/podmanV2/images/list.go
index cfdfaaed2..4714af3e4 100644
--- a/cmd/podmanV2/images/list.go
+++ b/cmd/podmanV2/images/list.go
@@ -1,16 +1,40 @@
package images
import (
+ "errors"
+ "fmt"
+ "os"
+ "sort"
+ "strings"
+ "text/tabwriter"
+ "text/template"
+ "time"
+
"github.com/containers/libpod/cmd/podmanV2/registry"
+ "github.com/containers/libpod/cmd/podmanV2/report"
"github.com/containers/libpod/pkg/domain/entities"
+ jsoniter "github.com/json-iterator/go"
"github.com/spf13/cobra"
+ "github.com/spf13/pflag"
)
+type listFlagType struct {
+ format string
+ history bool
+ noHeading bool
+ noTrunc bool
+ quiet bool
+ sort string
+ readOnly bool
+ digests bool
+}
+
var (
// Command: podman image _list_
listCmd = &cobra.Command{
Use: "list [flag] [IMAGE]",
Aliases: []string{"ls"},
+ Args: cobra.MaximumNArgs(1),
Short: "List images in local storage",
Long: "Lists images previously pulled to the system or created on the system.",
RunE: images,
@@ -18,6 +42,19 @@ var (
podman image list --sort repository --format "table {{.ID}} {{.Repository}} {{.Tag}}"
podman image list --filter dangling=true`,
}
+
+ // Options to pull data
+ listOptions = entities.ImageListOptions{}
+
+ // Options for presenting data
+ listFlag = listFlagType{}
+
+ sortFields = entities.NewStringSet(
+ "created",
+ "id",
+ "repository",
+ "size",
+ "tag")
)
func init() {
@@ -26,8 +63,181 @@ func init() {
Command: listCmd,
Parent: imageCmd,
})
+ imageListFlagSet(listCmd.Flags())
+}
+
+func imageListFlagSet(flags *pflag.FlagSet) {
+ flags.BoolVarP(&listOptions.All, "all", "a", false, "Show all images (default hides intermediate images)")
+ flags.StringSliceVarP(&listOptions.Filter, "filter", "f", []string{}, "Filter output based on conditions provided (default [])")
+ flags.StringVar(&listFlag.format, "format", "", "Change the output format to JSON or a Go template")
+ flags.BoolVar(&listFlag.digests, "digests", false, "Show digests")
+ flags.BoolVarP(&listFlag.noHeading, "noheading", "n", false, "Do not print column headings")
+ flags.BoolVar(&listFlag.noTrunc, "no-trunc", false, "Do not truncate output")
+ flags.BoolVar(&listFlag.noTrunc, "notruncate", false, "Do not truncate output")
+ flags.BoolVarP(&listFlag.quiet, "quiet", "q", false, "Display only image IDs")
+ flags.StringVar(&listFlag.sort, "sort", "created", "Sort by "+sortFields.String())
+ flags.BoolVarP(&listFlag.history, "history", "", false, "Display the image name history")
}
func images(cmd *cobra.Command, args []string) error {
- return nil
+ if len(listOptions.Filter) > 0 && len(args) > 0 {
+ return errors.New("cannot specify an image and a filter(s)")
+ }
+
+ if len(listOptions.Filter) < 1 && len(args) > 0 {
+ listOptions.Filter = append(listOptions.Filter, "reference="+args[0])
+ }
+
+ if cmd.Flag("sort").Changed && !sortFields.Contains(listFlag.sort) {
+ return fmt.Errorf("\"%s\" is not a valid field for sorting. Choose from: %s",
+ listFlag.sort, sortFields.String())
+ }
+
+ summaries, err := registry.ImageEngine().List(registry.GetContext(), listOptions)
+ if err != nil {
+ return err
+ }
+
+ imageS := summaries
+ sort.Slice(imageS, sortFunc(listFlag.sort, imageS))
+
+ if cmd.Flag("format").Changed && listFlag.format == "json" {
+ return writeJSON(imageS)
+ } else {
+ return writeTemplate(imageS, err)
+ }
+}
+
+func writeJSON(imageS []*entities.ImageSummary) error {
+ type image struct {
+ entities.ImageSummary
+ Created string
+ }
+
+ imgs := make([]image, 0, len(imageS))
+ for _, e := range imageS {
+ var h image
+ h.ImageSummary = *e
+ h.Created = time.Unix(e.Created, 0).Format(time.RFC3339)
+ h.RepoTags = nil
+
+ imgs = append(imgs, h)
+ }
+
+ json := jsoniter.ConfigCompatibleWithStandardLibrary
+ enc := json.NewEncoder(os.Stdout)
+ return enc.Encode(imgs)
+}
+
+func writeTemplate(imageS []*entities.ImageSummary, err error) error {
+ type image struct {
+ entities.ImageSummary
+ Repository string `json:"repository,omitempty"`
+ Tag string `json:"tag,omitempty"`
+ }
+
+ imgs := make([]image, 0, len(imageS))
+ for _, e := range imageS {
+ for _, tag := range e.RepoTags {
+ var h image
+ h.ImageSummary = *e
+ h.Repository, h.Tag = tokenRepoTag(tag)
+ imgs = append(imgs, h)
+ }
+ if e.IsReadOnly() {
+ listFlag.readOnly = true
+ }
+ }
+
+ hdr, row := imageListFormat(listFlag)
+ format := hdr + "{{range . }}" + row + "{{end}}"
+
+ tmpl := template.Must(template.New("report").Funcs(report.PodmanTemplateFuncs()).Parse(format))
+ w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
+ defer w.Flush()
+ return tmpl.Execute(w, imgs)
+}
+
+func tokenRepoTag(tag string) (string, string) {
+ tokens := strings.SplitN(tag, ":", 2)
+ switch len(tokens) {
+ case 0:
+ return tag, ""
+ case 1:
+ return tokens[0], ""
+ case 2:
+ return tokens[0], tokens[1]
+ default:
+ return "<N/A>", ""
+ }
+}
+
+func sortFunc(key string, data []*entities.ImageSummary) func(i, j int) bool {
+ switch key {
+ case "id":
+ return func(i, j int) bool {
+ return data[i].ID < data[j].ID
+ }
+ case "repository":
+ return func(i, j int) bool {
+ return data[i].RepoTags[0] < data[j].RepoTags[0]
+ }
+ case "size":
+ return func(i, j int) bool {
+ return data[i].Size < data[j].Size
+ }
+ case "tag":
+ return func(i, j int) bool {
+ return data[i].RepoTags[0] < data[j].RepoTags[0]
+ }
+ default:
+ // case "created":
+ return func(i, j int) bool {
+ return data[i].Created >= data[j].Created
+ }
+ }
+}
+
+func imageListFormat(flags listFlagType) (string, string) {
+ if flags.quiet {
+ return "", "{{slice .ID 0 12}}\n"
+ }
+
+ // Defaults
+ hdr := "REPOSITORY\tTAG"
+ row := "{{.Repository}}\t{{if .Tag}}{{.Tag}}{{else}}<none>{{end}}"
+
+ if flags.digests {
+ hdr += "\tDIGEST"
+ row += "\t{{.Digest}}"
+ }
+
+ hdr += "\tID"
+ if flags.noTrunc {
+ row += "\tsha256:{{.ID}}"
+ } else {
+ row += "\t{{slice .ID 0 12}}"
+ }
+
+ hdr += "\tCREATED\tSIZE"
+ row += "\t{{humanDuration .Created}}\t{{humanSize .Size}}"
+
+ if flags.history {
+ hdr += "\tHISTORY"
+ row += "\t{{if .History}}{{join .History \", \"}}{{else}}<none>{{end}}"
+ }
+
+ if flags.readOnly {
+ hdr += "\tReadOnly"
+ row += "\t{{.ReadOnly}}"
+ }
+
+ if flags.noHeading {
+ hdr = ""
+ } else {
+ hdr += "\n"
+ }
+
+ row += "\n"
+ return hdr, row
}
diff --git a/cmd/podmanV2/images/rm.go b/cmd/podmanV2/images/rm.go
new file mode 100644
index 000000000..bb5880de3
--- /dev/null
+++ b/cmd/podmanV2/images/rm.go
@@ -0,0 +1,70 @@
+package images
+
+import (
+ "fmt"
+ "os"
+
+ "github.com/containers/libpod/cmd/podmanV2/registry"
+ "github.com/containers/libpod/pkg/domain/entities"
+ "github.com/pkg/errors"
+ "github.com/spf13/cobra"
+)
+
+var (
+ rmDescription = "Removes one or more previously pulled or locally created images."
+ rmCmd = &cobra.Command{
+ Use: "rm [flags] IMAGE [IMAGE...]",
+ Short: "Removes one or more images from local storage",
+ Long: rmDescription,
+ PreRunE: preRunE,
+ RunE: rm,
+ Example: `podman image rm imageID
+ podman image rm --force alpine
+ podman image rm c4dfb1609ee2 93fd78260bd1 c0ed59d05ff7`,
+ }
+
+ imageOpts = entities.ImageDeleteOptions{}
+)
+
+func init() {
+ registry.Commands = append(registry.Commands, registry.CliCommand{
+ Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+ Command: rmCmd,
+ Parent: imageCmd,
+ })
+
+ flags := rmCmd.Flags()
+ flags.BoolVarP(&imageOpts.All, "all", "a", false, "Remove all images")
+ flags.BoolVarP(&imageOpts.Force, "force", "f", false, "Force Removal of the image")
+}
+
+func rm(cmd *cobra.Command, args []string) error {
+
+ if len(args) < 1 && !imageOpts.All {
+ return errors.Errorf("image name or ID must be specified")
+ }
+ if len(args) > 0 && imageOpts.All {
+ return errors.Errorf("when using the --all switch, you may not pass any images names or IDs")
+ }
+
+ report, err := registry.ImageEngine().Delete(registry.GetContext(), args, imageOpts)
+ if err != nil {
+ switch {
+ case report != nil && report.ImageNotFound != nil:
+ fmt.Fprintln(os.Stderr, err.Error())
+ registry.SetExitCode(2)
+ case report != nil && report.ImageInUse != nil:
+ fmt.Fprintln(os.Stderr, err.Error())
+ default:
+ return err
+ }
+ }
+
+ for _, u := range report.Untagged {
+ fmt.Println("Untagged: " + u)
+ }
+ for _, d := range report.Deleted {
+ fmt.Println("Deleted: " + d)
+ }
+ return nil
+}
diff --git a/cmd/podmanV2/images/rmi.go b/cmd/podmanV2/images/rmi.go
new file mode 100644
index 000000000..7f9297bc9
--- /dev/null
+++ b/cmd/podmanV2/images/rmi.go
@@ -0,0 +1,30 @@
+package images
+
+import (
+ "strings"
+
+ "github.com/containers/libpod/cmd/podmanV2/registry"
+ "github.com/containers/libpod/pkg/domain/entities"
+ "github.com/spf13/cobra"
+)
+
+var (
+ rmiCmd = &cobra.Command{
+ Use: strings.Replace(rmCmd.Use, "rm ", "rmi ", 1),
+ Args: rmCmd.Args,
+ Short: rmCmd.Short,
+ Long: rmCmd.Long,
+ PreRunE: rmCmd.PreRunE,
+ RunE: rmCmd.RunE,
+ Example: strings.Replace(rmCmd.Example, "podman image rm", "podman rmi", -1),
+ }
+)
+
+func init() {
+ registry.Commands = append(registry.Commands, registry.CliCommand{
+ Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+ Command: rmiCmd,
+ })
+ rmiCmd.SetHelpTemplate(registry.HelpTemplate())
+ rmiCmd.SetUsageTemplate(registry.UsageTemplate())
+}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-10-11 23:18:22 +0000