Skip to content

Support foreign and encrypted layers in the unpacker.#3616

Merged
estesp merged 1 commit intocontainerd:masterfrom
Random-Liu:fix-unpack-on-windows
Sep 4, 2019
Merged

Support foreign and encrypted layers in the unpacker.#3616
estesp merged 1 commit intocontainerd:masterfrom
Random-Liu:fix-unpack-on-windows

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

@Random-Liu Random-Liu commented Sep 4, 2019

Fix unpacker for foreign layers and encrypted layers.

Not sure whether we should add a helper to check whether a media type is a layer.

Signed-off-by: Lantao Liu [email protected]

@Random-Liu Random-Liu added this to the 1.3 milestone Sep 4, 2019
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 4, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3616   +/-   ##
=======================================
  Coverage   42.38%   42.38%           
=======================================
  Files         126      126           
  Lines       13901    13901           
=======================================
  Hits         5892     5892           
  Misses       7123     7123           
  Partials      886      886
Flag Coverage Δ
#linux 45.91% <ø> (ø) ⬆️
#windows 37.2% <ø> (ø) ⬆️

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 c7c7955...d6a6e0b. Read the comment docs.

@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented Sep 4, 2019

We can merge this for now to fix the issue. having a function to check is probably a good idea. We might also want to do a prefix match before the "+" to support stuff like "zstd" without having to explicitly support it. The new stream processors can already handle it but I think currently we will end up filtering it with this sort of string matching.

Copy link
Copy Markdown
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

@Random-Liu
Copy link
Copy Markdown
Member Author

@dmcgowan SGTM. :)

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

Going to open a separate PR to update the encrypted layer media types to the most recent proposal in OCI to hopefully future-proof this set of strings for where the discussion is today across OCI and Kubernetes communities.

@estesp estesp merged commit 1eaf601 into containerd:master Sep 4, 2019
@Random-Liu Random-Liu deleted the fix-unpack-on-windows branch September 5, 2019 00:44
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.

4 participants