Skip to content

Add shim config for custom runtimes for plugins#41854

Merged
thaJeztah merged 1 commit into
moby:masterfrom
cpuguy83:for-linux-1169-plugins-custom-runtime-panic
Jan 21, 2021
Merged

Add shim config for custom runtimes for plugins#41854
thaJeztah merged 1 commit into
moby:masterfrom
cpuguy83:for-linux-1169-plugins-custom-runtime-panic

Conversation

@cpuguy83
Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 commented Jan 4, 2021

This fixes a panic when an admin specifies a custom default runtime,
when a plugin is started the shim config is nil.

Fixes docker/for-linux#1169
fixes docker/for-linux#1185

@cpuguy83 cpuguy83 force-pushed the for-linux-1169-plugins-custom-runtime-panic branch from 5ec84c5 to f197d3a Compare January 4, 2021 22:59
@thaJeztah thaJeztah added this to the 20.10.3 milestone Jan 5, 2021
@cpuguy83 cpuguy83 force-pushed the for-linux-1169-plugins-custom-runtime-panic branch from f197d3a to 1f9d799 Compare January 5, 2021 20:12
This fixes a panic when an admin specifies a custom default runtime,
when a plugin is started the shim config is nil.

Signed-off-by: Brian Goff <[email protected]>
@cpuguy83 cpuguy83 force-pushed the for-linux-1169-plugins-custom-runtime-panic branch from 1f9d799 to 2903863 Compare January 14, 2021 19:28
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Copy Markdown
Member

s390x failure is unrelated

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.

[20.10.2] start docker failed [v20.10.1] dockerd panics when configuring default runtime

3 participants