Skip to content

[release/1.2] cherry-pick: Limit multiple platform manifests to one for size check#3512

Merged
crosbymichael merged 1 commit intocontainerd:release/1.2from
fuweid:cp-3484
Aug 9, 2019
Merged

[release/1.2] cherry-pick: Limit multiple platform manifests to one for size check#3512
crosbymichael merged 1 commit intocontainerd:release/1.2from
fuweid:cp-3484

Conversation

@fuweid
Copy link
Copy Markdown
Member

@fuweid fuweid commented Aug 9, 2019

client.Pull will only pull one matching platform by default.
When checking the size of image we match that behavior so that
we don't look for multiple platforms that might not exist on disk.

Signed-off-by: Darren Shepherd [email protected]
(cherry picked from commit 1161409)
Signed-off-by: Wei Fu [email protected]

cherry-pick: #3484

client.Pull will only pull one matching platform by default.
When checking the size of image we match that behavior so that
we don't look for multiple platforms that might not exist on disk.

Signed-off-by: Darren Shepherd <[email protected]>
(cherry picked from commit 1161409)
Signed-off-by: Wei Fu <[email protected]>
@fuweid fuweid added this to the 1.2.8 milestone Aug 9, 2019
@codecov-io
Copy link
Copy Markdown

codecov-io commented Aug 9, 2019

Codecov Report

Merging #3512 into release/1.2 will decrease coverage by 3.58%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.2    #3512      +/-   ##
===============================================
- Coverage        47.25%   43.66%   -3.59%     
===============================================
  Files               92      101       +9     
  Lines             8471    10816    +2345     
===============================================
+ Hits              4003     4723     +720     
- Misses            3738     5357    +1619     
- Partials           730      736       +6
Flag Coverage Δ
#linux 47.25% <ø> (ø) ⬆️
#windows 40.78% <ø> (?)
Impacted Files Coverage Δ
snapshots/native/native.go 43.3% <0%> (-10%) ⬇️
metadata/snapshot.go 45.8% <0%> (-8.96%) ⬇️
archive/tar.go 43.79% <0%> (-7.07%) ⬇️
metadata/containers.go 47.97% <0%> (-6.62%) ⬇️
content/local/writer.go 58.65% <0%> (-5.55%) ⬇️
remotes/docker/resolver.go 59.2% <0%> (-5.09%) ⬇️
content/local/store.go 48.51% <0%> (-5.03%) ⬇️
metadata/images.go 57.57% <0%> (-4.99%) ⬇️
archive/tar_opts.go 28.57% <0%> (-4.77%) ⬇️
archive/compression/compression.go 58.69% <0%> (-4.7%) ⬇️
... and 57 more

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 6e4353d...47e5d5f. Read the comment docs.

@estesp estesp changed the title Limit multiple platform manifests to one for size check [release/1.2] cherry-pick: Limit multiple platform manifests to one for size check Aug 9, 2019
Copy link
Copy Markdown
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

@crosbymichael
Copy link
Copy Markdown
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.

5 participants