[Autoscaler] Precisely match docker HOME #12020
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
The current grep will match any env variable keyed by HOME. This will include some unwanted variables like PYTHONHOME, PROJECT_HOME, etc. Depending on the order of the environment variable, the subsequent docker setup command might fail.
ijrsvt
reviewed
Nov 14, 2020
ijrsvt
reviewed
Nov 14, 2020
ijrsvt
reviewed
Nov 14, 2020
| @@ -669,7 +669,7 @@ def _docker_expand_user(self, string, any_char=False): | |||
| if user_pos > -1: | |||
| if self.home_dir is None: | |||
| self.home_dir = self.ssh_command_runner.run( | |||
| "docker exec {} env | grep HOME | cut -d'=' -f2".format( | |||
| "docker exec {} env | grep ^HOME= | cut -d'=' -f2".format( | |||
There was a problem hiding this comment.
Should we add a fallback option? (Like if $HOME is not set)?
There was a problem hiding this comment.
Not sure about that. if HOME isn't set we should probably fail loudly basically it basically means user's env is broken.
There was a problem hiding this comment.
many, many commands rely on it
There was a problem hiding this comment.
Oh! Well then I'm fine with assuming that it is set :)
|
@ijrsvt I updated this PR with |
BEAUTIFUL! I'm always amazed by the available shell commands :) |
ijrsvt
approved these changes
Nov 15, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The current grep will match any env variable keyed by HOME. This will
include some unwanted variables like PYTHONHOME, PROJECT_HOME, etc.
Depending on the order of the environment variable, the subsequent
docker setup command might fail.
Why are these changes needed?
Related issue number
Checks
scripts/format.shto lint the changes in this PR.