[20.10 backport] Add shim config for custom runtimes for plugins#41974
Merged
tiborvass merged 1 commit intoFeb 18, 2021
Merged
Conversation
thaJeztah
added
area/runtime
thaJeztah
requested review from
AkihiroSuda and
cpuguy83
and removed request for
AkihiroSuda
February 3, 2021 13:29
3 tasks
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]> (cherry picked from commit 2903863) Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
20.10_backport_for_linux_1169_plugins_custom_runtime-panic
branch
from
February 17, 2021 20:20
89d22bc to
df2a989
Compare
Member
Author
|
rebased to trigger CI with test-fixes that were merged |
tiborvass
approved these changes
Feb 18, 2021
thaJeztah
deleted the
20.10_backport_for_linux_1169_plugins_custom_runtime-panic
branch
February 18, 2021 21:26
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.
backport of #41854
fixes docker/for-linux#1169 [v20.10.1] dockerd panics when configuring default runtime
fixes docker/for-linux#1185 [20.10.2] start docker failed
This fixes a panic when an admin specifies a custom default runtime,
when a plugin is started the shim config is nil.
- Description for the changelog