Kaydet (Commit) b46e4a39 authored tarafından Joffrey F's avatar Joffrey F

Modify expand_registry_url to support v2 private registries.

üst 6dd45d75
......@@ -29,7 +29,7 @@ DOCKER_CONFIG_FILENAME = '.dockercfg'
def expand_registry_url(hostname, insecure=False):
if hostname.startswith('http:') or hostname.startswith('https:'):
return hostname
if utils.ping('https://' + hostname + '/v1/_ping'):
if utils.ping_registry('https://' + hostname):
return 'https://' + hostname
elif insecure:
return 'http://' + hostname
......
from .utils import (
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,
create_container_config, parse_bytes
create_container_config, parse_bytes, ping_registry
) # flake8: noqa
......@@ -118,6 +118,10 @@ def compare_version(v1, v2):
return 1
def ping_registry(url):
return ping(url + '/v2/_ping') or ping(url + '/v1/_ping')
def ping(url):
try:
res = requests.get(url, timeout=3)
......
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