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

Umoci unpack fix #4168

Merged
merged 10 commits into from
Aug 14, 2019
Merged

Umoci unpack fix #4168

merged 10 commits into from
Aug 14, 2019

Conversation

ikaneshiro
Copy link
Contributor

Description of the Pull Request (PR):

This PR rebases the work done by @AdamSimpson in #3921 to a more current branch and applies his suggestion of having separate, platform dependent, implementations of layer unpacking.

NOTE: umoci v0.4.2 is used to prevent an a dependency issue with github.com/opencontainers/runtime-spec v1.0.0 having backwards incompatibilities

This fixes or addresses the following GitHub issues:

Before submitting a PR, make sure you have done the following:

Attn: @singularity-maintainers

@ikaneshiro ikaneshiro requested a review from mem August 9, 2019 14:03
@ikaneshiro ikaneshiro assigned jmstover and ikaneshiro and unassigned jmstover Aug 9, 2019
@ikaneshiro ikaneshiro requested a review from jmstover August 9, 2019 14:03
@ikaneshiro
Copy link
Contributor Author

@AdamSimpson Looks like I cant add you as a reviewer in the github ui, but I'd like to get your approval here to make sure the work you've done is properly credited and that this works for you

@AdamSimpson
Copy link
Contributor

Awesome, that looks great!

Copy link
Contributor

@gvallee gvallee left a comment

Choose a reason for hiding this comment

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

lgtm

This change creates two small files to split oci layer unpacking into a
new function that allows for different behavior based on platform.

NOTE: umoci v0.4.2 is used to prevent an a dependency issue with
github.com/opencontainers/runtime-spec v1.0.0 not being backwards
compatable

Update apptainer#3921 to most recent master
Copy link
Contributor

@WestleyK WestleyK left a comment

Choose a reason for hiding this comment

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

Looks good to me 👍

Interesting how theres a stray log.Infof() in the umoci code... Maybe theres a good use for it?...

@ikaneshiro ikaneshiro merged commit 8ef64a1 into apptainer:master Aug 14, 2019
@ikaneshiro ikaneshiro deleted the umoci_unpack_fix branch August 14, 2019 23:36
@ikaneshiro ikaneshiro mentioned this pull request Aug 16, 2019
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.

Importing docker image results in incorrect file permissions
5 participants