Build from url#2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aanand merged 2 commits into from
Nov 26, 2015
Merged

Build from url #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7239f4
Added support for url buid paths
jonaseck2 Apr 29, 2015
2ab3cb2
Add integration test and docs for build with a git url.
dnephin Nov 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions compose/config/config.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@
'external_links',
]

DOCKER_VALID_URL_PREFIXES = (
'http://',
'https://',
'git://',
'github.com/',
'git@',
)

SUPPORTED_FILENAMES = [
'docker-compose.yml',
Expand DownExpand Up@@ -377,7 +384,7 @@ def process_service(service_config):
service_dict['volumes'] = resolve_volume_paths(working_dir, 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:
service_dict['labels'] = parse_labels(service_dict['labels'])
Expand DownExpand Up@@ -539,11 +546,26 @@ def resolve_volume_path(working_dir, volume):
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):
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 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, is not accessible, "
"or is not a valid URL." % build_path)


def merge_path_mappings(base, override):
Expand Down
11 changes: 7 additions & 4 deletions docs/compose-file.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,15 +31,18 @@ definition.

### build

Path to a directory containing a Dockerfile. When the value supplied is a
relative path, it is interpreted as relative to the location of the yml file
itself. This directory is also the build context that is sent to the Docker daemon.
Either a path to a directory containing a Dockerfile, or a url to a git repository.

When the value supplied is a relative path, it is interpreted as relative to the
location of the Compose file. This directory is also the build context that is
sent to the Docker daemon.

Compose will build and tag it with a generated name, and use that image thereafter.

build: /path/to/build/dir

Using `build` together with `image` is not allowed. Attempting to do so results in an error.
Using `build` together with `image` is not allowed. Attempting to do so results in
an error.

### cap_add, cap_drop

Expand Down
7 changes: 7 additions & 0 deletions tests/integration/service_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -507,6 +507,13 @@ def test_build_non_ascii_filename(self):
self.create_service('web', build=text_type(base_dir)).build()
self.assertEqual(len(self.client.images(name='composetest_web')), 1)

def test_build_with_git_url(self):
build_url = "https://github.com/dnephin/docker-build-from-url.git"
service = self.create_service('buildwithurl', build=build_url)
self.addCleanup(self.client.remove_image, service.image_name)
service.build()
assert service.image()

def test_start_container_stays_unpriviliged(self):
service = self.create_service('web')
container = create_and_start_container(service).inspect()
Expand Down
28 changes: 28 additions & 0 deletions tests/unit/config/config_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1497,6 +1497,34 @@ def test_from_file(self):
service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])

def test_valid_url_in_build_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',
'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

def test_invalid_url_in_build_path(self):
invalid_urls = [
'example.com/bogus',
'ftp://example.com/',
'/path/does/not/exist',
]
for invalid_url in invalid_urls:
with pytest.raises(ConfigurationError) as exc:
config.load(build_config_details({
'invalidurl': {'build': invalid_url},
}, '.', None))
assert 'build path' in exc.exconly()


class GetDefaultConfigFilesTestCase(unittest.TestCase):

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Build from url#2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aanand
merged 2 commits into

from

Nov 26, 2015
 Merged


Build from url
#2430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7239f4

Added support for url buid paths


jonaseck2 Apr 29, 2015
2ab3cb2

Add integration test and docs for build with a git url.


dnephin Nov 19, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 25 additions & 3 deletions
compose/config/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@
 'external_links',
]

DOCKER_VALID_URL_PREFIXES = (
 'http://',
 'https://',
 'git://',
 'github.com/',
 'git@',
)

SUPPORTED_FILENAMES = [
 'docker-compose.yml',
Expand DownExpand Up@@ -377,7 +384,7 @@ def process_service(service_config):
 service_dict['volumes'] = resolve_volume_paths(working_dir, 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:
 service_dict['labels'] = parse_labels(service_dict['labels'])
Expand DownExpand Up@@ -539,11 +546,26 @@ def resolve_volume_path(working_dir, volume):
 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):
 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 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, is not accessible, "
 "or is not a valid URL." % build_path)


def merge_path_mappings(base, override):
Expand Down

11 changes: 7 additions & 4 deletions
docs/compose-file.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,15 +31,18 @@ definition.

### build

Path to a directory containing a Dockerfile. When the value supplied is a
relative path, it is interpreted as relative to the location of the yml file
itself. This directory is also the build context that is sent to the Docker daemon.
Either a path to a directory containing a Dockerfile, or a url to a git repository.

When the value supplied is a relative path, it is interpreted as relative to the
location of the Compose file. This directory is also the build context that is
sent to the Docker daemon.

Compose will build and tag it with a generated name, and use that image thereafter.

 build: /path/to/build/dir

Using `build` together with `image` is not allowed. Attempting to do so results in an error.
Using `build` together with `image` is not allowed. Attempting to do so results in
an error.

### cap_add, cap_drop

Expand Down

7 changes: 7 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -507,6 +507,13 @@ def test_build_non_ascii_filename(self):
 self.create_service('web', build=text_type(base_dir)).build()
 self.assertEqual(len(self.client.images(name='composetest_web')), 1)

 def test_build_with_git_url(self):
 build_url = "https://github.com/dnephin/docker-build-from-url.git"
 service = self.create_service('buildwithurl', build=build_url)
 self.addCleanup(self.client.remove_image, service.image_name)
 service.build()
 assert service.image()

 def test_start_container_stays_unpriviliged(self):
 service = self.create_service('web')
 container = create_and_start_container(service).inspect()
Expand Down

28 changes: 28 additions & 0 deletions
tests/unit/config/config_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1497,6 +1497,34 @@ def test_from_file(self):
 service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
 self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])

 def test_valid_url_in_build_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',
 '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

 def test_invalid_url_in_build_path(self):
 invalid_urls = [
 'example.com/bogus',
 'ftp://example.com/',
 '/path/does/not/exist',
 ]
 for invalid_url in invalid_urls:
 with pytest.raises(ConfigurationError) as exc:
 config.load(build_config_details({
 'invalidurl': {'build': invalid_url},
 }, '.', None))
 assert 'build path' in exc.exconly()


class GetDefaultConfigFilesTestCase(unittest.TestCase):

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Build from url#2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aanand
merged 2 commits into

from

Nov 26, 2015
 Merged


Build from url
#2430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7239f4

Added support for url buid paths


jonaseck2 Apr 29, 2015
2ab3cb2

Add integration test and docs for build with a git url.


dnephin Nov 19, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 25 additions & 3 deletions
compose/config/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@
 'external_links',
]

DOCKER_VALID_URL_PREFIXES = (
 'http://',
 'https://',
 'git://',
 'github.com/',
 'git@',
)

SUPPORTED_FILENAMES = [
 'docker-compose.yml',
Expand DownExpand Up@@ -377,7 +384,7 @@ def process_service(service_config):
 service_dict['volumes'] = resolve_volume_paths(working_dir, 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:
 service_dict['labels'] = parse_labels(service_dict['labels'])
Expand DownExpand Up@@ -539,11 +546,26 @@ def resolve_volume_path(working_dir, volume):
 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):
 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 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, is not accessible, "
 "or is not a valid URL." % build_path)


def merge_path_mappings(base, override):
Expand Down

11 changes: 7 additions & 4 deletions
docs/compose-file.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,15 +31,18 @@ definition.

### build

Path to a directory containing a Dockerfile. When the value supplied is a
relative path, it is interpreted as relative to the location of the yml file
itself. This directory is also the build context that is sent to the Docker daemon.
Either a path to a directory containing a Dockerfile, or a url to a git repository.

When the value supplied is a relative path, it is interpreted as relative to the
location of the Compose file. This directory is also the build context that is
sent to the Docker daemon.

Compose will build and tag it with a generated name, and use that image thereafter.

 build: /path/to/build/dir

Using `build` together with `image` is not allowed. Attempting to do so results in an error.
Using `build` together with `image` is not allowed. Attempting to do so results in
an error.

### cap_add, cap_drop

Expand Down

7 changes: 7 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -507,6 +507,13 @@ def test_build_non_ascii_filename(self):
 self.create_service('web', build=text_type(base_dir)).build()
 self.assertEqual(len(self.client.images(name='composetest_web')), 1)

 def test_build_with_git_url(self):
 build_url = "https://github.com/dnephin/docker-build-from-url.git"
 service = self.create_service('buildwithurl', build=build_url)
 self.addCleanup(self.client.remove_image, service.image_name)
 service.build()
 assert service.image()

 def test_start_container_stays_unpriviliged(self):
 service = self.create_service('web')
 container = create_and_start_container(service).inspect()
Expand Down

28 changes: 28 additions & 0 deletions
tests/unit/config/config_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1497,6 +1497,34 @@ def test_from_file(self):
 service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
 self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])

 def test_valid_url_in_build_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',
 '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

 def test_invalid_url_in_build_path(self):
 invalid_urls = [
 'example.com/bogus',
 'ftp://example.com/',
 '/path/does/not/exist',
 ]
 for invalid_url in invalid_urls:
 with pytest.raises(ConfigurationError) as exc:
 config.load(build_config_details({
 'invalidurl': {'build': invalid_url},
 }, '.', None))
 assert 'build path' in exc.exconly()


class GetDefaultConfigFilesTestCase(unittest.TestCase):

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Build from url#2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aanand
merged 2 commits into

from

Nov 26, 2015
 Merged


Build from url
#2430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7239f4

Added support for url buid paths


jonaseck2 Apr 29, 2015
2ab3cb2

Add integration test and docs for build with a git url.


dnephin Nov 19, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 25 additions & 3 deletions
compose/config/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@
 'external_links',
]

DOCKER_VALID_URL_PREFIXES = (
 'http://',
 'https://',
 'git://',
 'github.com/',
 'git@',
)

SUPPORTED_FILENAMES = [
 'docker-compose.yml',
Expand DownExpand Up@@ -377,7 +384,7 @@ def process_service(service_config):
 service_dict['volumes'] = resolve_volume_paths(working_dir, 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:
 service_dict['labels'] = parse_labels(service_dict['labels'])
Expand DownExpand Up@@ -539,11 +546,26 @@ def resolve_volume_path(working_dir, volume):
 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):
 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 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, is not accessible, "
 "or is not a valid URL." % build_path)


def merge_path_mappings(base, override):
Expand Down

11 changes: 7 additions & 4 deletions
docs/compose-file.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,15 +31,18 @@ definition.

### build

Path to a directory containing a Dockerfile. When the value supplied is a
relative path, it is interpreted as relative to the location of the yml file
itself. This directory is also the build context that is sent to the Docker daemon.
Either a path to a directory containing a Dockerfile, or a url to a git repository.

When the value supplied is a relative path, it is interpreted as relative to the
location of the Compose file. This directory is also the build context that is
sent to the Docker daemon.

Compose will build and tag it with a generated name, and use that image thereafter.

 build: /path/to/build/dir

Using `build` together with `image` is not allowed. Attempting to do so results in an error.
Using `build` together with `image` is not allowed. Attempting to do so results in
an error.

### cap_add, cap_drop

Expand Down

7 changes: 7 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -507,6 +507,13 @@ def test_build_non_ascii_filename(self):
 self.create_service('web', build=text_type(base_dir)).build()
 self.assertEqual(len(self.client.images(name='composetest_web')), 1)

 def test_build_with_git_url(self):
 build_url = "https://github.com/dnephin/docker-build-from-url.git"
 service = self.create_service('buildwithurl', build=build_url)
 self.addCleanup(self.client.remove_image, service.image_name)
 service.build()
 assert service.image()

 def test_start_container_stays_unpriviliged(self):
 service = self.create_service('web')
 container = create_and_start_container(service).inspect()
Expand Down

28 changes: 28 additions & 0 deletions
tests/unit/config/config_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1497,6 +1497,34 @@ def test_from_file(self):
 service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
 self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])

 def test_valid_url_in_build_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',
 '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

 def test_invalid_url_in_build_path(self):
 invalid_urls = [
 'example.com/bogus',
 'ftp://example.com/',
 '/path/does/not/exist',
 ]
 for invalid_url in invalid_urls:
 with pytest.raises(ConfigurationError) as exc:
 config.load(build_config_details({
 'invalidurl': {'build': invalid_url},
 }, '.', None))
 assert 'build path' in exc.exconly()


class GetDefaultConfigFilesTestCase(unittest.TestCase):

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Build from url#2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aanand
merged 2 commits into

from

Nov 26, 2015
 Merged


Build from url
#2430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7239f4

Added support for url buid paths


jonaseck2 Apr 29, 2015
2ab3cb2

Add integration test and docs for build with a git url.


dnephin Nov 19, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 25 additions & 3 deletions
compose/config/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@
 'external_links',
]

DOCKER_VALID_URL_PREFIXES = (
 'http://',
 'https://',
 'git://',
 'github.com/',
 'git@',
)

SUPPORTED_FILENAMES = [
 'docker-compose.yml',
Expand DownExpand Up@@ -377,7 +384,7 @@ def process_service(service_config):
 service_dict['volumes'] = resolve_volume_paths(working_dir, 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:
 service_dict['labels'] = parse_labels(service_dict['labels'])
Expand DownExpand Up@@ -539,11 +546,26 @@ def resolve_volume_path(working_dir, volume):
 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):
 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 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, is not accessible, "
 "or is not a valid URL." % build_path)


def merge_path_mappings(base, override):
Expand Down

11 changes: 7 additions & 4 deletions
docs/compose-file.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,15 +31,18 @@ definition.

### build

Path to a directory containing a Dockerfile. When the value supplied is a
relative path, it is interpreted as relative to the location of the yml file
itself. This directory is also the build context that is sent to the Docker daemon.
Either a path to a directory containing a Dockerfile, or a url to a git repository.

When the value supplied is a relative path, it is interpreted as relative to the
location of the Compose file. This directory is also the build context that is
sent to the Docker daemon.

Compose will build and tag it with a generated name, and use that image thereafter.

 build: /path/to/build/dir

Using `build` together with `image` is not allowed. Attempting to do so results in an error.
Using `build` together with `image` is not allowed. Attempting to do so results in
an error.

### cap_add, cap_drop

Expand Down

7 changes: 7 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -507,6 +507,13 @@ def test_build_non_ascii_filename(self):
 self.create_service('web', build=text_type(base_dir)).build()
 self.assertEqual(len(self.client.images(name='composetest_web')), 1)

 def test_build_with_git_url(self):
 build_url = "https://github.com/dnephin/docker-build-from-url.git"
 service = self.create_service('buildwithurl', build=build_url)
 self.addCleanup(self.client.remove_image, service.image_name)
 service.build()
 assert service.image()

 def test_start_container_stays_unpriviliged(self):
 service = self.create_service('web')
 container = create_and_start_container(service).inspect()
Expand Down

28 changes: 28 additions & 0 deletions
tests/unit/config/config_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1497,6 +1497,34 @@ def test_from_file(self):
 service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
 self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])

 def test_valid_url_in_build_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',
 '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

 def test_invalid_url_in_build_path(self):
 invalid_urls = [
 'example.com/bogus',
 'ftp://example.com/',
 '/path/does/not/exist',
 ]
 for invalid_url in invalid_urls:
 with pytest.raises(ConfigurationError) as exc:
 config.load(build_config_details({
 'invalidurl': {'build': invalid_url},
 }, '.', None))
 assert 'build path' in exc.exconly()


class GetDefaultConfigFilesTestCase(unittest.TestCase):

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Build from url#2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aanand
merged 2 commits into

from

Nov 26, 2015
 Merged


Build from url
#2430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7239f4

Added support for url buid paths


jonaseck2 Apr 29, 2015
2ab3cb2

Add integration test and docs for build with a git url.


dnephin Nov 19, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 25 additions & 3 deletions
compose/config/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@
 'external_links',
]

DOCKER_VALID_URL_PREFIXES = (
 'http://',
 'https://',
 'git://',
 'github.com/',
 'git@',
)

SUPPORTED_FILENAMES = [
 'docker-compose.yml',
Expand DownExpand Up@@ -377,7 +384,7 @@ def process_service(service_config):
 service_dict['volumes'] = resolve_volume_paths(working_dir, 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:
 service_dict['labels'] = parse_labels(service_dict['labels'])
Expand DownExpand Up@@ -539,11 +546,26 @@ def resolve_volume_path(working_dir, volume):
 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):
 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 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, is not accessible, "
 "or is not a valid URL." % build_path)


def merge_path_mappings(base, override):
Expand Down

11 changes: 7 additions & 4 deletions
docs/compose-file.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,15 +31,18 @@ definition.

### build

Path to a directory containing a Dockerfile. When the value supplied is a
relative path, it is interpreted as relative to the location of the yml file
itself. This directory is also the build context that is sent to the Docker daemon.
Either a path to a directory containing a Dockerfile, or a url to a git repository.

When the value supplied is a relative path, it is interpreted as relative to the
location of the Compose file. This directory is also the build context that is
sent to the Docker daemon.

Compose will build and tag it with a generated name, and use that image thereafter.

 build: /path/to/build/dir

Using `build` together with `image` is not allowed. Attempting to do so results in an error.
Using `build` together with `image` is not allowed. Attempting to do so results in
an error.

### cap_add, cap_drop

Expand Down

7 changes: 7 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -507,6 +507,13 @@ def test_build_non_ascii_filename(self):
 self.create_service('web', build=text_type(base_dir)).build()
 self.assertEqual(len(self.client.images(name='composetest_web')), 1)

 def test_build_with_git_url(self):
 build_url = "https://github.com/dnephin/docker-build-from-url.git"
 service = self.create_service('buildwithurl', build=build_url)
 self.addCleanup(self.client.remove_image, service.image_name)
 service.build()
 assert service.image()

 def test_start_container_stays_unpriviliged(self):
 service = self.create_service('web')
 container = create_and_start_container(service).inspect()
Expand Down

28 changes: 28 additions & 0 deletions
tests/unit/config/config_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1497,6 +1497,34 @@ def test_from_file(self):
 service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
 self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])

 def test_valid_url_in_build_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',
 '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

 def test_invalid_url_in_build_path(self):
 invalid_urls = [
 'example.com/bogus',
 'ftp://example.com/',
 '/path/does/not/exist',
 ]
 for invalid_url in invalid_urls:
 with pytest.raises(ConfigurationError) as exc:
 config.load(build_config_details({
 'invalidurl': {'build': invalid_url},
 }, '.', None))
 assert 'build path' in exc.exconly()


class GetDefaultConfigFilesTestCase(unittest.TestCase):

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Build from url#2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aanand
merged 2 commits into

from

Nov 26, 2015
 Merged


Build from url
#2430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7239f4

Added support for url buid paths


jonaseck2 Apr 29, 2015
2ab3cb2

Add integration test and docs for build with a git url.


dnephin Nov 19, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 25 additions & 3 deletions
compose/config/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@
 'external_links',
]

DOCKER_VALID_URL_PREFIXES = (
 'http://',
 'https://',
 'git://',
 'github.com/',
 'git@',
)

SUPPORTED_FILENAMES = [
 'docker-compose.yml',
Expand DownExpand Up@@ -377,7 +384,7 @@ def process_service(service_config):
 service_dict['volumes'] = resolve_volume_paths(working_dir, 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:
 service_dict['labels'] = parse_labels(service_dict['labels'])
Expand DownExpand Up@@ -539,11 +546,26 @@ def resolve_volume_path(working_dir, volume):
 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):
 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 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, is not accessible, "
 "or is not a valid URL." % build_path)


def merge_path_mappings(base, override):
Expand Down

11 changes: 7 additions & 4 deletions
docs/compose-file.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,15 +31,18 @@ definition.

### build

Path to a directory containing a Dockerfile. When the value supplied is a
relative path, it is interpreted as relative to the location of the yml file
itself. This directory is also the build context that is sent to the Docker daemon.
Either a path to a directory containing a Dockerfile, or a url to a git repository.

When the value supplied is a relative path, it is interpreted as relative to the
location of the Compose file. This directory is also the build context that is
sent to the Docker daemon.

Compose will build and tag it with a generated name, and use that image thereafter.

 build: /path/to/build/dir

Using `build` together with `image` is not allowed. Attempting to do so results in an error.
Using `build` together with `image` is not allowed. Attempting to do so results in
an error.

### cap_add, cap_drop

Expand Down

7 changes: 7 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -507,6 +507,13 @@ def test_build_non_ascii_filename(self):
 self.create_service('web', build=text_type(base_dir)).build()
 self.assertEqual(len(self.client.images(name='composetest_web')), 1)

 def test_build_with_git_url(self):
 build_url = "https://github.com/dnephin/docker-build-from-url.git"
 service = self.create_service('buildwithurl', build=build_url)
 self.addCleanup(self.client.remove_image, service.image_name)
 service.build()
 assert service.image()

 def test_start_container_stays_unpriviliged(self):
 service = self.create_service('web')
 container = create_and_start_container(service).inspect()
Expand Down

28 changes: 28 additions & 0 deletions
tests/unit/config/config_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1497,6 +1497,34 @@ def test_from_file(self):
 service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
 self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])

 def test_valid_url_in_build_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',
 '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

 def test_invalid_url_in_build_path(self):
 invalid_urls = [
 'example.com/bogus',
 'ftp://example.com/',
 '/path/does/not/exist',
 ]
 for invalid_url in invalid_urls:
 with pytest.raises(ConfigurationError) as exc:
 config.load(build_config_details({
 'invalidurl': {'build': invalid_url},
 }, '.', None))
 assert 'build path' in exc.exconly()


class GetDefaultConfigFilesTestCase(unittest.TestCase):

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Build from url#2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aanand
merged 2 commits into

from

Nov 26, 2015
 Merged


Build from url
#2430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7239f4

Added support for url buid paths


jonaseck2 Apr 29, 2015
2ab3cb2

Add integration test and docs for build with a git url.


dnephin Nov 19, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 25 additions & 3 deletions
compose/config/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@
 'external_links',
]

DOCKER_VALID_URL_PREFIXES = (
 'http://',
 'https://',
 'git://',
 'github.com/',
 'git@',
)

SUPPORTED_FILENAMES = [
 'docker-compose.yml',
Expand DownExpand Up@@ -377,7 +384,7 @@ def process_service(service_config):
 service_dict['volumes'] = resolve_volume_paths(working_dir, 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:
 service_dict['labels'] = parse_labels(service_dict['labels'])
Expand DownExpand Up@@ -539,11 +546,26 @@ def resolve_volume_path(working_dir, volume):
 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):
 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 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, is not accessible, "
 "or is not a valid URL." % build_path)


def merge_path_mappings(base, override):
Expand Down

11 changes: 7 additions & 4 deletions
docs/compose-file.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,15 +31,18 @@ definition.

### build

Path to a directory containing a Dockerfile. When the value supplied is a
relative path, it is interpreted as relative to the location of the yml file
itself. This directory is also the build context that is sent to the Docker daemon.
Either a path to a directory containing a Dockerfile, or a url to a git repository.

When the value supplied is a relative path, it is interpreted as relative to the
location of the Compose file. This directory is also the build context that is
sent to the Docker daemon.

Compose will build and tag it with a generated name, and use that image thereafter.

 build: /path/to/build/dir

Using `build` together with `image` is not allowed. Attempting to do so results in an error.
Using `build` together with `image` is not allowed. Attempting to do so results in
an error.

### cap_add, cap_drop

Expand Down

7 changes: 7 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -507,6 +507,13 @@ def test_build_non_ascii_filename(self):
 self.create_service('web', build=text_type(base_dir)).build()
 self.assertEqual(len(self.client.images(name='composetest_web')), 1)

 def test_build_with_git_url(self):
 build_url = "https://github.com/dnephin/docker-build-from-url.git"
 service = self.create_service('buildwithurl', build=build_url)
 self.addCleanup(self.client.remove_image, service.image_name)
 service.build()
 assert service.image()

 def test_start_container_stays_unpriviliged(self):
 service = self.create_service('web')
 container = create_and_start_container(service).inspect()
Expand Down

28 changes: 28 additions & 0 deletions
tests/unit/config/config_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1497,6 +1497,34 @@ def test_from_file(self):
 service_dict = load_from_filename('tests/fixtures/build-path/docker-compose.yml')
 self.assertEquals(service_dict, [{'name': 'foo', 'build': self.abs_context_path}])

 def test_valid_url_in_build_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',
 '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

 def test_invalid_url_in_build_path(self):
 invalid_urls = [
 'example.com/bogus',
 'ftp://example.com/',
 '/path/does/not/exist',
 ]
 for invalid_url in invalid_urls:
 with pytest.raises(ConfigurationError) as exc:
 config.load(build_config_details({
 'invalidurl': {'build': invalid_url},
 }, '.', None))
 assert 'build path' in exc.exconly()


class GetDefaultConfigFilesTestCase(unittest.TestCase):

Expand Down