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

Daemon expects full URL of hub in auth config dict in build payload 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-08-15 15:38:09 -07:00 committed by Joffrey F
parent 35f29d08d7
commit e9fab1432b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/api/build.py
View File

@ -274,7 +274,10 @@ class BuildApiMixin(object):
self._auth_configs, registry self._auth_configs, registry
) )
else: else:
auth_data = self._auth_configs auth_data = self._auth_configs.copy()
# See https://github.com/docker/docker-py/issues/1683
if auth.INDEX_NAME in auth_data:
auth_data[auth.INDEX_URL] = auth_data[auth.INDEX_NAME]
log.debug( log.debug(
'Sending auth config ({0})'.format( 'Sending auth config ({0})'.format(

4
docker/auth.py
View File

@ -10,7 +10,7 @@ from . import errors
from .constants import IS_WINDOWS_PLATFORM from .constants import IS_WINDOWS_PLATFORM
INDEX_NAME = 'docker.io' INDEX_NAME = 'docker.io'
INDEX_URL = 'https://{0}/v1/'.format(INDEX_NAME) INDEX_URL = 'https://index.{0}/v1/'.format(INDEX_NAME)
DOCKER_CONFIG_FILENAME = os.path.join('.docker', 'config.json') DOCKER_CONFIG_FILENAME = os.path.join('.docker', 'config.json')
LEGACY_DOCKER_CONFIG_FILENAME = '.dockercfg' LEGACY_DOCKER_CONFIG_FILENAME = '.dockercfg'
TOKEN_USERNAME = '<token>' TOKEN_USERNAME = '<token>'
@ -118,7 +118,7 @@ def _resolve_authconfig_credstore(authconfig, registry, credstore_name):
if not registry or registry == INDEX_NAME: if not registry or registry == INDEX_NAME:
# The ecosystem is a little schizophrenic with index.docker.io VS # The ecosystem is a little schizophrenic with index.docker.io VS
# docker.io - in that case, it seems the full URL is necessary. # docker.io - in that case, it seems the full URL is necessary.
registry = 'https://index.docker.io/v1/' registry = INDEX_URL
log.debug("Looking for auth entry for {0}".format(repr(registry))) log.debug("Looking for auth entry for {0}".format(repr(registry)))
store = dockerpycreds.Store(credstore_name) store = dockerpycreds.Store(credstore_name)
try: try: