Add support for containerd shim activation's within the same folder not in PATH#2960
Merged
crosbymichael merged 2 commits intocontainerd:masterfrom Jan 28, 2019
Merged
Conversation
Use full name including extension for shim binary format on Windows in order to match any stat path faster without a fallback. Signed-off-by: Justin Terry (VM) <[email protected]>
Signed-off-by: Justin Terry (VM) <[email protected]>
Contributor
Author
|
@jhowardmsft - FYI this is the containerd side fix for microsoft/hcsshim#460 |
Codecov Report
@@ Coverage Diff @@
## master #2960 +/- ##
==========================================
- Coverage 44.02% 43.97% -0.05%
==========================================
Files 102 102
Lines 10863 10874 +11
==========================================
Hits 4782 4782
- Misses 5348 5359 +11
Partials 733 733
Continue to review full report at Codecov.
|
Member
|
LGTM |
1 similar comment
Member
|
LGTM |
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
4 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.
Adds fallback support for
exec.LookPathwhich will not find the executable next tocontainerd.exeifcontainerd.exewas started from a different folder than where it is currently running. This fix will use thecontainerdbinary path as a last resort to locate the shim if the shim itself is not found in the PATH.