mirror of
https://github.com/containers/podman.git
synced 2025-12-16 03:57:36 +08:00
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>
This commit is contained in:
@@ -6,7 +6,6 @@ import (
|
||||
"bufio"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/pkg/errors"
|
||||
"io"
|
||||
"os"
|
||||
@@ -113,7 +112,7 @@ func (r *LocalRuntime) GetImages() ([]*ContainerImage, error) {
|
||||
}
|
||||
|
||||
func imageInListToContainerImage(i iopodman.ImageInList, name string, runtime *LocalRuntime) (*ContainerImage, error) {
|
||||
created, err := splitStringDate(i.Created)
|
||||
created, err := time.ParseInLocation(time.RFC3339, i.Created, time.UTC)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -182,12 +181,6 @@ func (r *LocalRuntime) New(ctx context.Context, name, signaturePolicyPath, authf
|
||||
return newImage, nil
|
||||
}
|
||||
|
||||
func splitStringDate(d string) (time.Time, error) {
|
||||
fields := strings.Fields(d)
|
||||
t := fmt.Sprintf("%sT%sZ", fields[0], fields[1])
|
||||
return time.ParseInLocation(time.RFC3339Nano, t, time.UTC)
|
||||
}
|
||||
|
||||
// IsParent goes through the layers in the store and checks if i.TopLayer is
|
||||
// the parent of any other layer in store. Double check that image with that
|
||||
// layer exists as well.
|
||||
@@ -251,7 +244,7 @@ func (ci *ContainerImage) History(ctx context.Context) ([]*image.History, error)
|
||||
return nil, err
|
||||
}
|
||||
for _, h := range reply {
|
||||
created, err := splitStringDate(h.Created)
|
||||
created, err := time.ParseInLocation(time.RFC3339, h.Created, time.UTC)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user