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

Merge pull request #1928 from mnottale/fix-spurious-resolution-macos-slowdown 

Workaround requests resolving our unix socket URL on macosx.
This commit is contained in:
Joffrey F 2018-02-27 08:58:59 -08:00 committed by GitHub
parent fe966764ef 15c26e7057
commit 9b8e022fa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/api/client.py
View File

@ -119,7 +119,9 @@ class APIClient(
) )
self.mount('http+docker://', self._custom_adapter) self.mount('http+docker://', self._custom_adapter)
self._unmount('http://', 'https://') self._unmount('http://', 'https://')
self.base_url = 'http+docker://localunixsocket' # host part of URL should be unused, but is resolved by requests
# module in proxy_bypass_macosx_sysconf()
self.base_url = 'http+docker://localhost'
elif base_url.startswith('npipe://'): elif base_url.startswith('npipe://'):
if not IS_WINDOWS_PLATFORM: if not IS_WINDOWS_PLATFORM:
raise DockerException( raise DockerException(

2
tests/unit/fake_api.py
View File

@ -512,7 +512,7 @@ def post_fake_network_disconnect():
# Maps real api url to fake response callback # Maps real api url to fake response callback
prefix = 'http+docker://localunixsocket' prefix = 'http+docker://localhost'
if constants.IS_WINDOWS_PLATFORM: if constants.IS_WINDOWS_PLATFORM:
prefix = 'http+docker://localnpipe' prefix = 'http+docker://localnpipe'