Use containerd's default runtime shim instead of hard-coded runtime v1#1570
Merged
Conversation
This is the shim used by the containerd Runtime V2 on Linux, per the default setting of `io.containerd.runc.v2`. Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
This reverts commit 9290c15. This was pinned during the upgrade to containerd 1.3 series, which changed the default runtime on Linux to io.containerd.runc.v2. No specific rationale was listed for this pinning, and clearly it's the wrong thing to do in the presence of Windows, which does not have this runtime. Instead, we rely on the containerd-internal defaults, which distinguish the runtimes for Linux and Windows. Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
This is the shim used by the containerd Runtime V1 on Linux, which was the default under containerd 1.2 and earlier. Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
This was referenced Jul 16, 2020
AkihiroSuda
approved these changes
Jul 16, 2020
tonistiigi
approved these changes
Jul 16, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Per #1314 (comment), this hard-coding was needed to support containerd 1.2, which as of BuildKit 0.7.0 is no longer supported for the containerd worker.
Contributes towards #616