Skip to content

Commit bef10ec

Browse files
committed
Add credstore_env to all load_config calls
Signed-off-by: Joffrey F <[email protected]>
1 parent 01ccaa6 commit bef10ec

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

docker/api/build.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,9 @@ def _set_auth_headers(self, headers):
288288
# file one more time in case anything showed up in there.
289289
if not self._auth_configs:
290290
log.debug("No auth config in memory - loading from filesystem")
291-
self._auth_configs = auth.load_config()
291+
self._auth_configs = auth.load_config(
292+
credsore_env=self.credsore_env
293+
)
292294

293295
# Send the full auth configuration (if any exists), since the build
294296
# could use any (or all) of the registries.

docker/api/client.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def __init__(self, base_url=None, version=None,
115115

116116
self._general_configs = config.load_general_config()
117117
self._auth_configs = auth.load_config(
118-
config_dict=self._general_configs
118+
config_dict=self._general_configs, credstore_env=credstore_env,
119119
)
120120
self.credstore_env = credstore_env
121121

@@ -476,4 +476,6 @@ def reload_config(self, dockercfg_path=None):
476476
Returns:
477477
None
478478
"""
479-
self._auth_configs = auth.load_config(dockercfg_path)
479+
self._auth_configs = auth.load_config(
480+
dockercfg_path, credstore_env=self.credstore_env
481+
)

0 commit comments

Comments
 (0)