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

vendor: update vendored version of containerd to latest 1.7 commit #4814

Merged
merged 1 commit into from
Mar 30, 2024

Conversation

daghack
Copy link
Collaborator

@daghack daghack commented Mar 29, 2024

Vendors the most up-to-date version of containerd, which includes upstream fix for #4595.

vendor containerd/containerd v1.7.15 0dcf21c1528a

Full diff: containerd/containerd@v1.7.14...0dcf21c

fixes #4595
closes #4682

@daghack daghack changed the title update vendored version of containerd to latest 1.7 commit vendor: update vendored version of containerd to latest 1.7 commit Mar 29, 2024
@tonistiigi
Copy link
Member

@daghack Can you include that test from #4682 now. Also, there seems to be a merge commit in current PR.

@daghack
Copy link
Collaborator Author

daghack commented Mar 29, 2024

Ah yup, there we are!

@daghack daghack force-pushed the update-vendored-containerd branch 2 times, most recently from bb2b00c to fce5e99 Compare March 29, 2024 22:53
go.mod Outdated Show resolved Hide resolved
@daghack daghack marked this pull request as draft March 29, 2024 22:55
Signed-off-by: Talon Bowler <talon.bowler@docker.com>
@daghack daghack marked this pull request as ready for review March 29, 2024 23:05
@tonistiigi tonistiigi merged commit ca7e856 into moby:master Mar 30, 2024
72 checks passed
@daghack daghack deleted the update-vendored-containerd branch April 26, 2024 20:36
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.

--output type=oci should set mediaType in the generated index.json
2 participants