diff options
| author | Joffrey F <joffrey@docker.com> | 2018-11-30 13:51:40 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-11-30 13:51:40 -0800 |
| commit | bef10ecac1692146fd770dcd0a098f28860bce13 (patch) | |
| tree | c568778b7a34ba444a1fb49a8d943e7a3c849674 | |
| parent | 01ccaa6af2106f01b9804177782622f12525b8a5 (diff) | |
| download | docker-py-bef10ecac1692146fd770dcd0a098f28860bce13.tar.gz | |
Add credstore_env to all load_config calls
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | docker/api/build.py | 4 | ||||
| -rw-r--r-- | docker/api/client.py | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/docker/api/build.py b/docker/api/build.py index 1723083..c4fc37e 100644 --- a/docker/api/build.py +++ b/docker/api/build.py @@ -288,7 +288,9 @@ class BuildApiMixin(object): # file one more time in case anything showed up in there. if not self._auth_configs: log.debug("No auth config in memory - loading from filesystem") - self._auth_configs = auth.load_config() + self._auth_configs = auth.load_config( + credsore_env=self.credsore_env + ) # Send the full auth configuration (if any exists), since the build # could use any (or all) of the registries. diff --git a/docker/api/client.py b/docker/api/client.py index 197846d..74c4698 100644 --- a/docker/api/client.py +++ b/docker/api/client.py @@ -115,7 +115,7 @@ class APIClient( self._general_configs = config.load_general_config() self._auth_configs = auth.load_config( - config_dict=self._general_configs + config_dict=self._general_configs, credstore_env=credstore_env, ) self.credstore_env = credstore_env @@ -476,4 +476,6 @@ class APIClient( Returns: None """ - self._auth_configs = auth.load_config(dockercfg_path) + self._auth_configs = auth.load_config( + dockercfg_path, credstore_env=self.credstore_env + ) |