beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #45623 from vvoland/c8d-inspect-created-time-24

Browse source 
[24.0 backport] c8d/inspect: Fill `Created` time if available
This commit is contained in:
Sebastiaan van Stijn 2023-05-25 22:22:34 +02:00 committed by GitHub
commit 67b3563d09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
daemon/containerd/image.go
View file

@ -68,14 +68,17 @@ func (i *ImageService) GetImage(ctx context.Context, refOrID string, options ima
exposedPorts[nat.Port(k)] = v
}
derefTimeSafely := func(t *time.Time) time.Time {
if t != nil {
return *t
}
return time.Time{}
}
var imgHistory []image.History
for _, h := range ociimage.History {
var created time.Time
if h.Created != nil {
created = *h.Created
}
imgHistory = append(imgHistory, image.History{
Created: created,
Created: derefTimeSafely(h.Created),
Author: h.Author,
CreatedBy: h.CreatedBy,
Comment: h.Comment,
@ -88,6 +91,7 @@ func (i *ImageService) GetImage(ctx context.Context, refOrID string, options ima
ID: string(desc.Digest),
OS: ociimage.OS,
Architecture: ociimage.Architecture,
Created: derefTimeSafely(ociimage.Created),
Config: &containertypes.Config{
Entrypoint: ociimage.Config.Entrypoint,
Env: ociimage.Config.Env,