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.

Sign up for GitHub

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

Jump to bottom

Update to ocicrypt 1.1.6 and add support for zstd type of compressed layers #96

Merged
merged 2 commits into from
Oct 11, 2022
Merged

Update to ocicrypt 1.1.6 and add support for zstd type of compressed layers #96

merged 2 commits into from
Oct 11, 2022

Conversation

stefanberger
Copy link
Contributor

Update to ocicrypt 1.1.6 and add support for zstd type of compressed layers

@stefanberger
build(deps): Update to ocicrypt 1.1.6
4a51045 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@k-gostev
Copy link

k-gostev commented Oct 7, 2022

@stefanberger Thanks a lot for your fast reaction, I really appreciate it!
I did not test it but I would guess that the zstd media type checks should also be added in the decrypt functions as well.

@stefanberger
Copy link
Contributor Author

I did not test it but I would guess that the zstd media type checks should also be added in the decrypt functions as well.

Added that now. Thanks.

@stefanberger
Add support for zstd type of compressed layers
06da359 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Resolves: containerd#95
@stefanberger
Copy link
Contributor Author

stefanberger commented Oct 7, 2022 •
edited
Loading

Thanks for providing the steps. After another fix I can now encrypt end decrypt with zstd-compressed images.

@stefanberger
Copy link
Contributor Author

It works for me, if it works for you @k-gostev as well , let me know and I'll merge it.

lumjjb
lumjjb approved these changes Oct 10, 2022
View reviewed changes
Copy link
Collaborator

@lumjjb lumjjb left a comment

Choose a reason for hiding this comment

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

LGTM

@k-gostev
Copy link

Works for me as well. Thank you!
LGTM

@stefanberger stefanberger merged commit ea92709 into containerd:main Oct 11, 2022
@stefanberger stefanberger deleted the stefanberger/zstd branch October 11, 2022 00:34
@k-gostev
Copy link

BTW could you tell me what are your plans about the next release that will include this fix? When could be expected?

@stefanberger
Copy link
Contributor Author

I can tag in the next few days.

@stefanberger
Copy link
Contributor Author

@k-gostev I tagged v1.1.7 now.

@dmcgowan dmcgowan mentioned this pull request May 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lumjjb lumjjb lumjjb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@stefanberger @k-gostev @lumjjb