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

[19.03] vendor: containerd 481103c8793316c118d9f795cde18060847c370e #40758

Merged
merged 1 commit into from Apr 2, 2020
Merged

[19.03] vendor: containerd 481103c8793316c118d9f795cde18060847c370e #40758

merged 1 commit into from Apr 2, 2020

Conversation

thaJeztah
Copy link
Member

full diff: containerd/containerd@7c1e883...481103c

  • Fix error handling for task deletion
  • Snapshots/devmapper: deactivate thin device after committed
  • Fix fd leak of shim log
  • Fix killall when use pidnamespace
  • Improve ARM platform matching

- Description for the changelog

- Improve ARM platform matching

@thaJeztah
Copy link
Member Author

These changes should bring in fixes w.r.t. matching the correct arm image. Note that this is not a cherry-pick from master, but just bumping the containerd version to the merge commit with the fix (containerd/containerd#3270)

@thaJeztah
Copy link
Member Author

@StefanScherer @tonistiigi @cpuguy83 PTAL

@thaJeztah thaJeztah added this to the 19.03.9 milestone Mar 30, 2020
@thaJeztah
[19.03] vendor: containerd 481103c8793316c118d9f795cde18060847c370e
359edd8 
full diff: containerd/containerd@7c1e883...481103c

- Fix error handling for task deletion
- Fix fd leak of shim log
- Fix killall when use pidnamespace
- Improve ARM platform matching

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
StefanScherer
StefanScherer approved these changes Mar 30, 2020
View reviewed changes
Copy link
Contributor

@StefanScherer StefanScherer left a comment

Choose a reason for hiding this comment

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

LGTM,
internal tests show that a DOCKER_BUILDKIT=1 docker build now work with multi-arch images used in FROM.

cpuguy83
cpuguy83 approved these changes Apr 2, 2020
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@tiborvass tiborvass merged commit 43b0a73 into moby:19.03 Apr 2, 2020
@thaJeztah thaJeztah deleted the 19.03_backport_arm_matching branch April 2, 2020 22:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@StefanScherer StefanScherer StefanScherer approved these changes

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@tiborvass tiborvass tiborvass approved these changes

Assignees
No one assigned
Labels
area/distribution area/images platform/arm status/2-code-review
Projects
None yet
Milestone
19.03.9
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@thaJeztah @StefanScherer @cpuguy83 @tiborvass