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

Added support for url buid paths 

Signed-off-by: Jonas Eckerström <jonaseck@gmail.com>
This commit is contained in:
Jonas Eckerström 2015-04-29 10:22:24 +02:00 committed by Daniel Nephin
parent 7b893164a4
commit f7239f41ef
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compose/config/config.py
View File

@ -76,6 +76,13 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
'external_links', 'external_links',
] ]
DOCKER_VALID_URL_PREFIXES = (
'http://',
'https://',
'git://',
'github.com/',
'git@',
)
SUPPORTED_FILENAMES = [ SUPPORTED_FILENAMES = [
'docker-compose.yml', 'docker-compose.yml',
@ -377,7 +384,7 @@ def process_service(service_config):
service_dict['volumes'] = resolve_volume_paths(working_dir, service_dict) service_dict['volumes'] = resolve_volume_paths(working_dir, service_dict)
if 'build' in service_dict: if 'build' in service_dict:
service_dict['build'] = expand_path(working_dir, service_dict['build']) service_dict['build'] = resolve_build_path(working_dir, service_dict['build'])
if 'labels' in service_dict: if 'labels' in service_dict:
service_dict['labels'] = parse_labels(service_dict['labels']) service_dict['labels'] = parse_labels(service_dict['labels'])
@ -539,11 +546,25 @@ def resolve_volume_path(working_dir, volume):
return container_path return container_path
def resolve_build_path(working_dir, build_path):
if is_url(build_path):
return build_path
return expand_path(working_dir, build_path)
def is_url(build_path):
return build_path.startswith(DOCKER_VALID_URL_PREFIXES)
def validate_paths(service_dict): def validate_paths(service_dict):
if 'build' in service_dict: if 'build' in service_dict:
build_path = service_dict['build'] build_path = service_dict['build']
if not os.path.exists(build_path) or not os.access(build_path, os.R_OK): if (
raise ConfigurationError("build path %s either does not exist or is not accessible." % build_path) not is_url(build_path) and
(not os.path.exists(build_path) or not os.access(build_path, os.R_OK))
):
raise ConfigurationError(
"build path %s either does not exist or is not accessible." % build_path)
def merge_path_mappings(base, override): def merge_path_mappings(base, override):

14
tests/unit/config/config_test.py
View File

@ -1497,6 +1497,20 @@ class BuildPathTest(unittest.TestCase):
service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml') service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}]) self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])
def test_valid_url_path(self):
valid_urls = [
'git://github.com/docker/docker',
'git@github.com:docker/docker.git',
'git@bitbucket.org:atlassianlabs/atlassian-docker.git',
'https://github.com/docker/docker.git',
'http://github.com/docker/docker.git',
]
for valid_url in valid_urls:
service_dict = config.load(build_config_details({
'validurl': {'build': valid_url},
}, '.', None))
assert service_dict[0]['build'] == valid_url
class GetDefaultConfigFilesTestCase(unittest.TestCase): class GetDefaultConfigFilesTestCase(unittest.TestCase):