docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated parameter name to make more sense.

This commit is contained in:
abanna 2014-12-18 09:37:45 -08:00
parent d3cf874938
commit 6dfae8bcd2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/auth/auth.py
View File

@ -117,18 +117,16 @@ def encode_full_header(auth):
return encode_header({'configs': auth}) return encode_header({'configs': auth})
def load_config(root=None): def load_config(config_path=None):
""" """
Loads authentication data from a Docker configuration file in the given Loads authentication data from a Docker configuration file in the given
root directory. root directory or if config_path is passed use given path.
If root passed config_file is set to new path.
""" """
conf = {} conf = {}
data = None data = None
config_file = root or os.path.join(os.environ.get('HOME', '.'), config_file = config_path or os.path.join(os.environ.get('HOME', '.'),
DOCKER_CONFIG_FILENAME) DOCKER_CONFIG_FILENAME)
# if config path doesn't exist return empty config # if config path doesn't exist return empty config
if not os.path.exists(config_file): if not os.path.exists(config_file):