Added support for url build paths

Author: jonaseck2

compose/config.py

@@ -56,6 +56,17 @@
     'workdir': 'working_dir',
 }
 
+DOCKER_VALID_URL_PREFIXES = (
+    'http://',
+    'https://',
+)
+
+DOCKER_VALID_GIT_PREFIXES = (
+    'git://',
+    'github.com/',
+    'git@',
+)
+
 
 def load(filename):
     working_dir = os.path.dirname(filename)
@@ -346,14 +357,25 @@ def resolve_host_path(volume, working_dir):
 def resolve_build_path(build_path, working_dir=None):
     if working_dir is None:
         raise Exception("No working_dir passed to resolve_build_path")
-    return expand_path(working_dir, build_path)
+    if is_git_url(build_path) or is_url(build_path):
+        return build_path
+    else:
+        return expand_path(working_dir, build_path)
 
 
 def validate_paths(service_dict):
     if 'build' in service_dict:
         build_path = service_dict['build']
-        if 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)
+        if (not os.path.exists(build_path) or not os.access(build_path, os.R_OK)) and not is_git_url(build_path):
+            raise ConfigurationError("build path %s either does not exist, is not accessible or is not a valid url." % build_path)
+
+
+def is_url(build_path):
+    return build_path.startswith(DOCKER_VALID_URL_PREFIXES)
+
+
+def is_git_url(build_path):
+    return build_path.startswith(DOCKER_VALID_GIT_PREFIXES) or is_url(build_path) and build_path.endswith('.git')
 
 
 def merge_volumes(base, override):

tests/unit/config_test.py

@@ -448,3 +448,34 @@ def test_absolute_path(self):
     def test_from_file(self):
         service_dict = config.load('tests/fixtures/build-path/docker-compose.yml')
         self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])
+
+    def pytest_generate_tests(metafunc):
+        if "valid_url" in metafunc.funcargnames:
+            metafunc.parametrize("valid_url", [
+                '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'
+            ])
+        elif "invalid_url" in metafunc.funcargnames:
+            metafunc.parametrize("invalid_url", [
+                'github.com/docker/docker'
+            ])
+
+    def test_valid_url_path(self, valid_url):
+        service_dict = config.make_service_dict(
+            {'build': valid_url},
+            working_dir='tests/fixtures/build-path'
+        )
+        self.assertEquals(service_dict['build'], valid_url)
+
+    def test_invalid_url_path(self, invalid_url):
+        options = {'build': invalid_url}
+        self.assertRaises(
+            config.ConfigurationError,
+            lambda: config.from_dictionary({
+                'foo': options,
+                'working_dir': 'tests/fixtures/build-path'
+            })
+        )