Use DOCKER_CONFIG environment variable to look up auth config #802
Conversation
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
docker/auth/auth.py
Outdated
There was a problem hiding this comment.
I'd like to make a suggestion here that I think will make it easier to test. I think the logic for "find config file" can be separated from "read contents of config file".
def find_config(config_path=None):
for path in (
config_path,
os.path.join(os.environ.get('DOCKER_CONFIG'), os.path.basename(DOCKER_CONFIG_FILENAME)),
os.path.join(os.path.expanduser('~'), DOCKER_CONFIG_FILENAME),
os.path.exists(os.path.join(os.path.expanduser('~'), LEGACY_DOCKER_CONFIG_FILENAME))
):
if path and os.path.exists(path):
return path
return None
shin-
force-pushed
the
785-docker_config_env
branch
from
aa4f675 to
6394a73
Compare
When provided, default paths are ignored. Signed-off-by: Joffrey F <joffrey@docker.com>
shin-
force-pushed
the
785-docker_config_env
branch
from
6394a73 to
23cf768
Compare
|
Implemented @dnephin 's suggestions and rebased. |
|
LGTM |
shin-
added a commit
that referenced
this pull request
Oct 14, 2015
Use DOCKER_CONFIG environment variable to look up auth config
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.
When provided, default paths (
~/.docker/config.jsonand~/.dockercfg) are ignored.