Kaydet (Commit) 15c26e70 authored tarafından Matthieu Nottale's avatar Matthieu Nottale

Workaround requests resolving our unix socket URL on macosx.

Signed-off-by: 's avatarMatthieu Nottale <matthieu.nottale@docker.com>
üst 8b246db2
...@@ -119,7 +119,9 @@ class APIClient( ...@@ -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(
......
...@@ -512,7 +512,7 @@ def post_fake_network_disconnect(): ...@@ -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'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment