opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 00:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: use UTC Time Stamps in response JSON

Browse Source 
Signed-off-by: Matej Vasek <mvasek@redhat.com>
This commit is contained in:
Matej Vasek
2021-05-10 10:17:04 +02:00
parent 54bed1025d
commit dd98e70302
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/api/handlers/compat/containers.go
View File

@ -379,6 +379,11 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Docker uses UTC
if inspect != nil && inspect.State != nil {
inspect.State.StartedAt = inspect.State.StartedAt.UTC()
inspect.State.FinishedAt = inspect.State.FinishedAt.UTC()
}
i, err := json.Marshal(inspect.State) i, err := json.Marshal(inspect.State)
if err != nil { if err != nil {
return nil, err return nil, err
@ -425,7 +430,7 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
cb := types.ContainerJSONBase{ cb := types.ContainerJSONBase{
ID: l.ID(), ID: l.ID(),
Created: l.CreatedTime().Format(time.RFC3339Nano), Created: l.CreatedTime().UTC().Format(time.RFC3339Nano), // Docker uses UTC
Path: inspect.Path, Path: inspect.Path,
Args: inspect.Args, Args: inspect.Args,
State: &state, State: &state,

6
test/apiv2/20-containers.at
View File

@ -161,6 +161,12 @@ t GET libpod/containers/myctr/json 200 \
.OCIConfigPath~.*config\.json \ .OCIConfigPath~.*config\.json \
.GraphDriver.Data.MergedDir~.*merged .GraphDriver.Data.MergedDir~.*merged
# Test TS are in UTC
t GET containers/myctr/json 200 \
.Created~.*Z \
.State.StartedAt~.*Z \
.State.FinishedAt~.*Z
t DELETE images/localhost/newrepo:latest?force=true 200 t DELETE images/localhost/newrepo:latest?force=true 200
t DELETE images/localhost/newrepo:v1?force=true 200 t DELETE images/localhost/newrepo:v1?force=true 200
t DELETE images/localhost/newrepo:v2?force=true 200 t DELETE images/localhost/newrepo:v2?force=true 200