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

Add credHelpers support to set_auth_headers in build 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-07-10 15:51:17 -04:00
parent f71d1cf3cf
commit d4345b5824
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/api/build.py
View File

@ -293,20 +293,28 @@ class BuildApiMixin(object):
# Send the full auth configuration (if any exists), since the build # Send the full auth configuration (if any exists), since the build
# could use any (or all) of the registries. # could use any (or all) of the registries.
if self._auth_configs: if self._auth_configs:
auth_cfgs = self._auth_configs
auth_data = {} auth_data = {}
if self._auth_configs.get('credsStore'): if auth_cfgs.get('credsStore'):
# Using a credentials store, we need to retrieve the # Using a credentials store, we need to retrieve the
# credentials for each registry listed in the config.json file # credentials for each registry listed in the config.json file
# Matches CLI behavior: https://github.com/docker/docker/blob/ # Matches CLI behavior: https://github.com/docker/docker/blob/
# 67b85f9d26f1b0b2b240f2d794748fac0f45243c/cliconfig/ # 67b85f9d26f1b0b2b240f2d794748fac0f45243c/cliconfig/
# credentials/native_store.go#L68-L83 # credentials/native_store.go#L68-L83
for registry in self._auth_configs.get('auths', {}).keys(): for registry in auth_cfgs.get('auths', {}).keys():
auth_data[registry] = auth.resolve_authconfig( auth_data[registry] = auth.resolve_authconfig(
self._auth_configs, registry, auth_cfgs, registry,
credstore_env=self.credstore_env, credstore_env=self.credstore_env,
) )
else: else:
auth_data = self._auth_configs.get('auths', {}).copy() for registry in auth_cfgs.get('credHelpers', {}).keys():
auth_data[registry] = auth.resolve_authconfig(
auth_cfgs, registry,
credstore_env=self.credstore_env
)
for registry, creds in auth_cfgs.get('auths', {}).items():
if registry not in auth_data:
auth_data[registry] = creds
# See https://github.com/docker/docker-py/issues/1683 # See https://github.com/docker/docker-py/issues/1683
if auth.INDEX_NAME in auth_data: if auth.INDEX_NAME in auth_data:
auth_data[auth.INDEX_URL] = auth_data[auth.INDEX_NAME] auth_data[auth.INDEX_URL] = auth_data[auth.INDEX_NAME]