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

Use containerd's default runtime shim instead of hard-coded runtime v1 #1570

Merged
merged 3 commits into from
Jul 16, 2020

Conversation

TBBle
Copy link
Collaborator

@TBBle TBBle commented Jul 16, 2020

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

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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
@tonistiigi tonistiigi merged commit cc80971 into moby:master Jul 16, 2020
@TBBle TBBle deleted the use-containerd-default-shim branch July 16, 2020 16:02
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.

3 participants