diff options
| author | Lars Karlitski <lars@karlitski.net> | 2019-02-04 18:56:41 +0100 |
|---|---|---|
| committer | Lars Karlitski <lars@karlitski.net> | 2019-02-12 14:47:49 +0100 |
| commit | 29392b77e90b59e6f7b7d78db78c9c0ae045bc06 (patch) | |
| tree | 74f6465ab04f1e2bb2248b67ff06a566c0c3e9b9 /pkg | |
| parent | 38e42476cba14515cd2dbc53318ff1882a94b1c5 (diff) | |
| download | podman-29392b77e90b59e6f7b7d78db78c9c0ae045bc06.tar.gz podman-29392b77e90b59e6f7b7d78db78c9c0ae045bc06.tar.bz2 podman-29392b77e90b59e6f7b7d78db78c9c0ae045bc06.zip | |
varlink: Return all times in RFC 3339 format
This is more consistent and eaiser to parse than the format that
golang's time.String() returns.
Fixes #2260
Signed-off-by: Lars Karlitski <lars@karlitski.net>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/varlinkapi/images.go | 6 | ||||
| -rw-r--r-- | pkg/varlinkapi/system.go | 3 | ||||
| -rw-r--r-- | pkg/varlinkapi/util.go | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go index 6463d9edb..ecf4d331c 100644 --- a/pkg/varlinkapi/images.go +++ b/pkg/varlinkapi/images.go @@ -57,7 +57,7 @@ func (i *LibpodAPI) ListImages(call iopodman.VarlinkCall) error { ParentId: image.Parent, RepoTags: image.Names(), RepoDigests: repoDigests, - Created: image.Created().String(), + Created: image.Created().Format(time.RFC3339), Size: int64(*size), VirtualSize: image.VirtualSize, Containers: int64(len(containers)), @@ -97,7 +97,7 @@ func (i *LibpodAPI) GetImage(call iopodman.VarlinkCall, name string) error { ParentId: newImage.Parent, RepoTags: newImage.Names(), RepoDigests: repoDigests, - Created: newImage.Created().String(), + Created: newImage.Created().Format(time.RFC3339), Size: int64(*size), VirtualSize: newImage.VirtualSize, Containers: int64(len(containers)), @@ -309,7 +309,7 @@ func (i *LibpodAPI) HistoryImage(call iopodman.VarlinkCall, name string) error { for _, hist := range history { imageHistory := iopodman.ImageHistory{ Id: hist.ID, - Created: hist.Created.String(), + Created: hist.Created.Format(time.RFC3339), CreatedBy: hist.CreatedBy, Tags: newImage.Names(), Size: hist.Size, diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go index 0c063cee9..a64dc4217 100644 --- a/pkg/varlinkapi/system.go +++ b/pkg/varlinkapi/system.go @@ -3,6 +3,7 @@ package varlinkapi import ( goruntime "runtime" "strings" + "time" "github.com/containers/libpod/cmd/podman/varlink" "github.com/containers/libpod/libpod" @@ -20,7 +21,7 @@ func (i *LibpodAPI) GetVersion(call iopodman.VarlinkCall) error { Version: versionInfo.Version, Go_version: versionInfo.GoVersion, Git_commit: versionInfo.GitCommit, - Built: versionInfo.Built, + Built: time.Unix(versionInfo.Built, 0).Format(time.RFC3339), Os_arch: versionInfo.OsArch, }) } diff --git a/pkg/varlinkapi/util.go b/pkg/varlinkapi/util.go index a80c8db41..51891e729 100644 --- a/pkg/varlinkapi/util.go +++ b/pkg/varlinkapi/util.go @@ -61,7 +61,7 @@ func makeListContainer(containerID string, batchInfo shared.BatchContainerStruct Image: batchInfo.ConConfig.RootfsImageName, Imageid: batchInfo.ConConfig.RootfsImageID, Command: batchInfo.ConConfig.Spec.Process.Args, - Createdat: batchInfo.ConConfig.CreatedTime.String(), + Createdat: batchInfo.ConConfig.CreatedTime.Format(time.RFC3339), Runningfor: time.Since(batchInfo.ConConfig.CreatedTime).String(), Status: batchInfo.ConState.String(), Ports: ports, @@ -107,7 +107,7 @@ func makeListPod(pod *libpod.Pod, batchInfo shared.PsOptions) (iopodman.ListPodD listPodsContainers = append(listPodsContainers, makeListPodContainers(ctr.ID(), batchInfo)) } listPod := iopodman.ListPodData{ - Createdat: pod.CreatedTime().String(), + Createdat: pod.CreatedTime().Format(time.RFC3339), Id: pod.ID(), Name: pod.Name(), Status: status, |