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

Merge pull request #8494 from mlegenovic/master

Browse Source 
More docker compat API fixes
This commit is contained in:
OpenShift Merge Robot
2020-12-04 15:48:20 -05:00
committed by GitHub
parent 07af857961 15d36f120c
commit b6536d20ed
4 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libpod/image/image.go
View File

@ -1222,6 +1222,11 @@ func (i *Image) inspect(ctx context.Context, calculateSize bool) (*inspect.Image
}
}
parent, err := i.ParentID(ctx)
if err != nil {
return nil, err
}
repoTags, err := i.RepoTags()
if err != nil {
return nil, err
@ -1248,6 +1253,7 @@ func (i *Image) inspect(ctx context.Context, calculateSize bool) (*inspect.Image
data := &inspect.ImageData{
ID: i.ID(),
Parent: parent,
RepoTags: repoTags,
RepoDigests: repoDigests,
Comment: comment,
@ -1258,10 +1264,12 @@ func (i *Image) inspect(ctx context.Context, calculateSize bool) (*inspect.Image
Config: &ociv1Img.Config,
Version: info.DockerVersion,
Size: size,
VirtualSize: size,
Annotations: annotations,
Digest: i.Digest(),
Labels: info.Labels,
// This is good enough for now, but has to be
// replaced later with correct calculation logic
VirtualSize: size,
Annotations: annotations,
Digest: i.Digest(),
Labels: info.Labels,
RootFS: &inspect.RootFS{
Type: ociv1Img.RootFS.Type,
Layers: ociv1Img.RootFS.DiffIDs,
@ -1505,6 +1513,15 @@ func (i *Image) GetParent(ctx context.Context) (*Image, error) {
return tree.parent(ctx, i)
}
// ParentID returns the image ID of the parent. Return empty string if a parent is not found.
func (i *Image) ParentID(ctx context.Context) (string, error) {
parent, err := i.GetParent(ctx)
if err == nil && parent != nil {
return parent.ID(), nil
}
return "", err
}
// GetChildren returns a list of the imageIDs that depend on the image
func (i *Image) GetChildren(ctx context.Context) ([]string, error) {
children, err := i.getChildren(ctx, true)