-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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.
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
Support for multi-arch image unpacking #1506
Support for multi-arch image unpacking #1506
Conversation
@dmcgowan Thanks~~~~ |
@dmcgowan I've pulled this PR down and confirmed that it will fix our CRI-Containerd CI test buckets. Just a couple lines of code to spec_opts_windows.go to get past the windows build break and good to go! |
@dmcgowan there is a windows build failure |
image.go
Outdated
@@ -98,19 +97,15 @@ func (i *image) Unpack(ctx context.Context, snapshotterName string) error { | |||
return nil | |||
} | |||
|
|||
func (i *image) getLayers(ctx context.Context) ([]rootfs.Layer, error) { | |||
func (i *image) getLayers(ctx context.Context, ps string) ([]rootfs.Layer, error) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: Can we get something more explicit than ps
? It usually makes me think of the ps
command and hence processes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
platformSpecifier would be more explicit, maybe platform or psp ...
f0581bd
to
bc0c368
Compare
Codecov Report
@@ Coverage Diff @@
## master #1506 +/- ##
=======================================
Coverage 40.82% 40.82%
=======================================
Files 23 23
Lines 2920 2920
=======================================
Hits 1192 1192
Misses 1451 1451
Partials 277 277 Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM; similar nit to @mlaventure about more descriptive variable
Resolves the platform on multi-arch manifests during unpack and config resolving. Signed-off-by: Derek McGowan <derek@mcgstyle.net>
bc0c368
to
46ded63
Compare
@estesp @mlaventure he changed ps to platform, and fixed the windows build. Looks good to me. |
LGTM |
Add config for registry http headers
Resolves the platform on multi-arch manifests during unpack and config resolving.