diff options
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/images/list.go | 12 | ||||
| -rw-r--r-- | cmd/podman/inspect.go | 18 | ||||
| -rw-r--r-- | cmd/podman/main.go | 5 |
3 files changed, 25 insertions, 10 deletions
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index de7cca40d..53be82dda 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -128,7 +128,7 @@ func writeID(imgs []imageReporter) error { func writeJSON(images []imageReporter) error { type image struct { entities.ImageSummary - Created string + Created int64 CreatedAt string } @@ -136,8 +136,8 @@ func writeJSON(images []imageReporter) error { for _, e := range images { var h image h.ImageSummary = e.ImageSummary - h.Created = units.HumanDuration(time.Since(e.ImageSummary.Created)) + " ago" - h.CreatedAt = e.ImageSummary.Created.Format(time.RFC3339Nano) + h.Created = e.ImageSummary.Created + h.CreatedAt = e.created().Format(time.RFC3339Nano) h.RepoTags = nil imgs = append(imgs, h) @@ -284,11 +284,11 @@ func (i imageReporter) ID() string { } func (i imageReporter) Created() string { - return units.HumanDuration(time.Since(i.ImageSummary.Created)) + " ago" + return units.HumanDuration(time.Since(i.created())) + " ago" } func (i imageReporter) created() time.Time { - return i.ImageSummary.Created + return time.Unix(i.ImageSummary.Created, 0).UTC() } func (i imageReporter) Size() string { @@ -302,7 +302,7 @@ func (i imageReporter) History() string { } func (i imageReporter) CreatedAt() string { - return i.ImageSummary.Created.String() + return i.created().String() } func (i imageReporter) CreatedSince() string { diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go index 12e11d0f5..befdeb445 100644 --- a/cmd/podman/inspect.go +++ b/cmd/podman/inspect.go @@ -8,12 +8,22 @@ import ( ) var ( + inspectDescription = `Displays the low-level information on an object identified by name or ID. + For more inspection options, see: + + podman container inspect + podman image inspect + podman network inspect + podman pod inspect + podman volume inspect` + // Command: podman _inspect_ Object_ID inspectCmd = &cobra.Command{ - Use: "inspect [flags] {CONTAINER_ID | IMAGE_ID} [...]", - Short: "Display the configuration of object denoted by ID", - Long: "Displays the low-level information on an object identified by name or ID", - RunE: inspectExec, + Use: "inspect [flags] {CONTAINER_ID | IMAGE_ID} [...]", + Short: "Display the configuration of object denoted by ID", + RunE: inspectExec, + Long: inspectDescription, + TraverseChildren: true, Example: `podman inspect fedora podman inspect --type image fedora podman inspect CtrID ImgID diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 7a015b300..636538131 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -29,6 +29,11 @@ func main() { return } + // Hard code TMPDIR functions to use /var/tmp, if user did not override + if _, ok := os.LookupEnv("TMPDIR"); !ok { + os.Setenv("TMPDIR", "/var/tmp") + } + cfg := registry.PodmanConfig() for _, c := range registry.Commands { for _, m := range c.Mode { |