summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-15 15:13:18 +0200
committerGitHub <noreply@github.com>2020-04-15 15:13:18 +0200
commita756161e80cd32b705bb0dfe3ec4753f883ec929 (patch)
tree9cb56a2ea3c77201de133eddad8d3bbf04b4a166 /cmd
parentffcb99d8320f7b53548af7210b9705a3590a1bb8 (diff)
parent60dde457f6dc5ec5062a946dbd0848a2b0b06a22 (diff)
downloadpodman-a756161e80cd32b705bb0dfe3ec4753f883ec929.tar.gz
podman-a756161e80cd32b705bb0dfe3ec4753f883ec929.tar.bz2
podman-a756161e80cd32b705bb0dfe3ec4753f883ec929.zip
Merge pull request #5813 from baude/v2edtests2
More system test fixes on regressions
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podmanV2/images/history.go9
-rw-r--r--cmd/podmanV2/images/inspect.go3
-rw-r--r--cmd/podmanV2/images/rm.go8
-rw-r--r--cmd/podmanV2/images/rmi.go1
4 files changed, 13 insertions, 8 deletions
diff --git a/cmd/podmanV2/images/history.go b/cmd/podmanV2/images/history.go
index 48575b33a..e3bb7a051 100644
--- a/cmd/podmanV2/images/history.go
+++ b/cmd/podmanV2/images/history.go
@@ -53,7 +53,7 @@ func init() {
flags := historyCmd.Flags()
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.BoolVarP(&opts.human, "human", "H", true, "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")
@@ -79,7 +79,7 @@ func history(cmd *cobra.Command, args []string) error {
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)
+ layers[i].Created = l.Created.Format(time.RFC3339)
}
json := jsoniter.ConfigCompatibleWithStandardLibrary
enc := json.NewEncoder(os.Stdout)
@@ -129,7 +129,10 @@ type historyreporter struct {
}
func (h historyreporter) Created() string {
- return units.HumanDuration(time.Since(time.Unix(h.ImageHistoryLayer.Created, 0))) + " ago"
+ if opts.human {
+ return units.HumanDuration(time.Since(h.ImageHistoryLayer.Created)) + " ago"
+ }
+ return h.ImageHistoryLayer.Created.Format(time.RFC3339)
}
func (h historyreporter) Size() string {
diff --git a/cmd/podmanV2/images/inspect.go b/cmd/podmanV2/images/inspect.go
index d7f6b0ee1..2ee2d86ee 100644
--- a/cmd/podmanV2/images/inspect.go
+++ b/cmd/podmanV2/images/inspect.go
@@ -67,7 +67,6 @@ func inspect(cmd *cobra.Command, args []string) error {
}
return nil
}
-
row := inspectFormat(inspectOpts.Format)
format := "{{range . }}" + row + "{{end}}"
tmpl, err := template.New("inspect").Parse(format)
@@ -77,7 +76,7 @@ func inspect(cmd *cobra.Command, args []string) error {
w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
defer func() { _ = w.Flush() }()
- err = tmpl.Execute(w, results)
+ err = tmpl.Execute(w, results.Images)
if err != nil {
return err
}
diff --git a/cmd/podmanV2/images/rm.go b/cmd/podmanV2/images/rm.go
index bb5880de3..6784182d9 100644
--- a/cmd/podmanV2/images/rm.go
+++ b/cmd/podmanV2/images/rm.go
@@ -8,6 +8,7 @@ import (
"github.com/containers/libpod/pkg/domain/entities"
"github.com/pkg/errors"
"github.com/spf13/cobra"
+ "github.com/spf13/pflag"
)
var (
@@ -33,11 +34,13 @@ func init() {
Parent: imageCmd,
})
- flags := rmCmd.Flags()
+ imageRemoveFlagSet(rmCmd.Flags())
+}
+
+func imageRemoveFlagSet(flags *pflag.FlagSet) {
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 {
@@ -46,7 +49,6 @@ func rm(cmd *cobra.Command, args []string) error {
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 {
diff --git a/cmd/podmanV2/images/rmi.go b/cmd/podmanV2/images/rmi.go
index 7f9297bc9..973763966 100644
--- a/cmd/podmanV2/images/rmi.go
+++ b/cmd/podmanV2/images/rmi.go
@@ -27,4 +27,5 @@ func init() {
})
rmiCmd.SetHelpTemplate(registry.HelpTemplate())
rmiCmd.SetUsageTemplate(registry.UsageTemplate())
+ imageRemoveFlagSet(rmiCmd.Flags())
}