This repository was archived by the owner on Mar 9, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 348
Add back default UNIX env to container config #1280
Merged
Merged
Conversation
This file contains 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
Closed
/test pull-cri-containerd-verify |
Random-Liu
reviewed
Sep 19, 2019
Due to changes to the defaults in containerd, the CRI path to creating a container OCI config needs to add back in the default UNIX $PATH (and any other defaults) as that is the expected behavior from other runtimes. Signed-off-by: Phil Estes <[email protected]>
8429aff
to
229eb19
Compare
/test pull-cri-containerd-verify |
mikebrow
approved these changes
Sep 19, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Random-Liu
reviewed
Sep 19, 2019
testID := "test-id" | ||
testSandboxID := "sandbox-id" | ||
testPid := uint32(1234) | ||
expectedDefault := "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should probably export Containerd default PATH, and use it here. We can do that in a following PR.
/lgtm |
@estesp Can you please also send cherry-picks to 1.2 and 1.3? Thanks! |
This was referenced Sep 19, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes: #1279
Due to changes to the defaults in containerd, the CRI path to creating a
container OCI config needs to add back in the default UNIX $PATH (and
any other defaults) as that is the expected behavior from other
runtimes.
This is a miss from our fix released in 1.2.9 after breaking in 1.2.8 with the standard path in containerd via the API and
ctr
client (reported in containerd issue #3597 and fixed in containerd PR #3599)Signed-off-by: Phil Estes [email protected]