Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: /image/{name or id}/json returns RootFS layers #8109

Merged
merged 3 commits into from
Oct 23, 2020
Merged

fix: /image/{name or id}/json returns RootFS layers #8109

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89e7b8f
fix: /image/{name}/json returns RootFS layers
matejvasek Oct 22, 2020
5098048
src: add nil checks
matejvasek Oct 22, 2020
a997b59
src: nil check
matejvasek Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion pkg/api/handlers/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,15 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI
if err != nil {
return nil, err
}

rootfs := docker.RootFS{}
if info.RootFS != nil && info.RootFS.Layers != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be split? i.e. test RootFS for nil and then set RootFS.Type if it is not nil, then test for RootFS.Layers and set that if it is not nil.

Copy link
Contributor Author

@matejvasek matejvasek Oct 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed that. It turned out that it's OK to call len() and range on nil slice.

rootfs.Type = info.RootFS.Type
rootfs.Layers = make([]string, 0, len(info.RootFS.Layers))
for _, layer := range info.RootFS.Layers {
rootfs.Layers = append(rootfs.Layers, string(layer))
}
}
dockerImageInspect := docker.ImageInspect{
Architecture: l.Architecture,
Author: l.Author,
Expand All @@ -286,7 +295,7 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI
Parent: l.Parent,
RepoDigests: info.RepoDigests,
RepoTags: info.RepoTags,
RootFS: docker.RootFS{},
RootFS: rootfs,
Size: info.Size,
Variant: "",
VirtualSize: info.VirtualSize,
Expand Down