Skip to content

[19.03] vendor: containerd 481103c8793316c118d9f795cde18060847c370e#40758

Merged
tiborvass merged 1 commit intomoby:19.03from
thaJeztah:19.03_backport_arm_matching
Apr 2, 2020
Merged

[19.03] vendor: containerd 481103c8793316c118d9f795cde18060847c370e#40758
tiborvass merged 1 commit intomoby:19.03from
thaJeztah:19.03_backport_arm_matching

Conversation

@thaJeztah
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Member Author

@StefanScherer @tonistiigi @cpuguy83 PTAL

@thaJeztah thaJeztah added this to the 19.03.9 milestone Mar 30, 2020
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>
@thaJeztah thaJeztah force-pushed the 19.03_backport_arm_matching branch from 22a88aa to 359edd8 Compare March 30, 2020 17:36
Copy link
Copy Markdown
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.

Copy link
Copy Markdown
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants