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.

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

Merged
merged 1 commit into from
Sep 14, 2017

Conversation

dmcgowan
Copy link
Member

Resolves the platform on multi-arch manifests during unpack and config resolving.

@Random-Liu
Copy link
Member

@dmcgowan Thanks~~~~

@mikebrow
Copy link
Member

mikebrow commented Sep 14, 2017

@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!

@crosbymichael
Copy link
Member

@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) {
Copy link
Contributor

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

Copy link
Member

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 ...

@codecov-io
Copy link

codecov-io commented Sep 14, 2017

Codecov Report

Merging #1506 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           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.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cc75a11...46ded63. Read the comment docs.

Copy link
Member

@estesp estesp left a 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>
@mikebrow
Copy link
Member

@estesp @mlaventure he changed ps to platform, and fixed the windows build. Looks good to me.

@crosbymichael
Copy link
Member

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants