[20.10 backport] cli/config: prevent warning if HOME is not set #2958
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
commit c2626a8 replaced the use of github.com/docker/docker/pkg/homedir with Golang's os.UserHomeDir(). This change was partially reverted in 7a279af to account for situations where `$HOME` is not set. In situations where no configuration file is present in `~/.config/`, the CLI falls back to looking for the (deprecated) `~/.dockercfg` configuration file, which was still using `os.UserHomeDir()`, which produces an error/warning if `$HOME` is not set. This patch introduces a helper function and a global variable to get the user's home-directory. The global variable is used to prevent repeatedly looking up the user's information (which, depending on the setup can be a costly operation). Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit c85a37d) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Codecov Report
@@ Coverage Diff @@
## 20.10 #2958 +/- ##
==========================================
+ Coverage 57.02% 57.03% +0.01%
==========================================
Files 297 297
Lines 18666 18667 +1
==========================================
+ Hits 10644 10647 +3
+ Misses 7157 7156 -1
+ Partials 865 864 -1 |
2 tasks
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.
backport of #2934
fixes moby/moby#41890 WARNING: Error loading config file: .dockercfg: $HOME is not defined
commit c2626a8 (#2101) replaced the use of github.com/docker/docker/pkg/homedir with Golang's
os.UserHomeDir().This change was partially reverted in 7a279af (#2111) to account for situations where
$HOMEis not set.In situations where no configuration file is present in
~/.config/, the CLI falls back to looking for the (deprecated)~/.dockercfgconfiguration file, which was still usingos.UserHomeDir(), which produces an error/warning if$HOMEis not set.This patch introduces a helper function and a global variable to get the user's home-directory. The global variable is used to prevent repeatedly looking up the user's information (which, depending on the setup can be a costly operation).
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)