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 #551 from docker/support_v2_private_registry 

Modify expand_registry_url to support v2 private registries.
This commit is contained in:
Joffrey F 2015-04-22 14:10:28 -07:00
parent 6dd45d7535 b46e4a398b
commit 5b69cbf4ef
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/auth/auth.py
View File

@ -29,7 +29,7 @@ DOCKER_CONFIG_FILENAME = '.dockercfg'
def expand_registry_url(hostname, insecure=False): def expand_registry_url(hostname, insecure=False):
if hostname.startswith('http:') or hostname.startswith('https:'): if hostname.startswith('http:') or hostname.startswith('https:'):
return hostname return hostname
if utils.ping('https://' + hostname + '/v1/_ping'): if utils.ping_registry('https://' + hostname):
return 'https://' + hostname return 'https://' + hostname
elif insecure: elif insecure:
return 'http://' + hostname return 'http://' + hostname

4
docker/utils/__init__.py
View File

@ -1,6 +1,6 @@
from .utils import ( from .utils import (
compare_version, convert_port_bindings, convert_volume_binds, compare_version, convert_port_bindings, convert_volume_binds,
mkbuildcontext, ping, tar, parse_repository_tag, parse_host, mkbuildcontext, tar, parse_repository_tag, parse_host,
kwargs_from_env, convert_filters, create_host_config, kwargs_from_env, convert_filters, create_host_config,
create_container_config, parse_bytes create_container_config, parse_bytes, ping_registry
) # flake8: noqa ) # flake8: noqa

4
docker/utils/utils.py
View File

@ -118,6 +118,10 @@ def compare_version(v1, v2):
return 1 return 1
def ping_registry(url):
return ping(url + '/v2/_ping') or ping(url + '/v1/_ping')
def ping(url): def ping(url):
try: try:
res = requests.get(url, timeout=3) res = requests.get(url, timeout=3)