Skip to content

Make Swarm schedule containers on the same node when they are linked together#972

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 1 commit into from
Mar 20, 2015
Merged

Make Swarm schedule containers on the same node when they are linked together #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion compose/cli/docker_client.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,4 +32,4 @@ def docker_client():
)

timeout = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
return Client(base_url=base_url, tls=tls_config, version='1.14', timeout=timeout)
return Client(base_url=base_url, tls=tls_config, version='1.15', timeout=timeout)
10 changes: 5 additions & 5 deletions compose/cli/main.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -328,20 +328,20 @@ def run(self, project, options):
if options['--user']:
container_options['user'] = options.get('--user')

if not options['--service-ports']:
container_options['ports'] = []

container = service.create_container(
one_off=True,
insecure_registry=insecure_registry,
**container_options
)

service_ports = None
if options['--service-ports']:
service_ports = service.options['ports']
if options['-d']:
service.start_container(container, ports=service_ports, one_off=True)
service.start_container(container)
print(container.name)
else:
service.start_container(container, ports=service_ports, one_off=True)
service.start_container(container)

@dnephindnephinMar 16, 2015

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor (since it's existing), this is being done in both branches of the is/else, so it should really happen before the branch.

dockerpty.start(project.client, container.id, interactive=not options['-T'])
exit_code = container.wait()
if options['--rm']:
Expand Down
94 changes: 57 additions & 37 deletions compose/service.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import sys

from docker.errors import APIError
from docker.utils import create_host_config

from .config import DOCKER_CONFIG_KEYS
from .container import Container, get_container_name
Expand DownExpand Up@@ -168,14 +169,17 @@ def create_container(self,
one_off=False,
insecure_registry=False,
do_build=True,
intermediate_container=None,
**override_options):
"""
Create a container for this service. If the image doesn't exist, attempt to pull
it.
"""
container_options = self._get_container_create_options(
override_options,
one_off=one_off)
one_off=one_off,
intermediate_container=intermediate_container,
)

if (do_build and
self.can_be_built() and
Expand DownExpand Up@@ -240,56 +244,33 @@ def recreate_container(self, container, **override_options):
entrypoint=['/bin/echo'],
command=[],
detach=True,
host_config=create_host_config(volumes_from=[container.id]),
)
intermediate_container.start(volumes_from=container.id)
intermediate_container.start()
intermediate_container.wait()
container.remove()

options = dict(override_options)
new_container = self.create_container(do_build=False, **options)
self.start_container(new_container, intermediate_container=intermediate_container)
new_container = self.create_container(
do_build=False,
intermediate_container=intermediate_container,
**options
)
self.start_container(new_container)

intermediate_container.remove()

return (intermediate_container, new_container)

def start_container_if_stopped(self, container, **options):
def start_container_if_stopped(self, container):
if container.is_running:
return container
else:
log.info("Starting %s..." % container.name)
return self.start_container(container, **options)

def start_container(self, container, intermediate_container=None, **override_options):
options = dict(self.options, **override_options)
port_bindings = build_port_bindings(options.get('ports') or [])

volume_bindings = dict(
build_volume_binding(parse_volume_spec(volume))
for volume in options.get('volumes') or []
if ':' in volume)

privileged = options.get('privileged', False)
dns = options.get('dns', None)
dns_search = options.get('dns_search', None)
cap_add = options.get('cap_add', None)
cap_drop = options.get('cap_drop', None)

restart = parse_restart_spec(options.get('restart', None))
return self.start_container(container)

container.start(
links=self._get_links(link_to_self=options.get('one_off', False)),
port_bindings=port_bindings,
binds=volume_bindings,
volumes_from=self._get_volumes_from(intermediate_container),
privileged=privileged,
network_mode=self._get_net(),
dns=dns,
dns_search=dns_search,
restart_policy=restart,
cap_add=cap_add,
cap_drop=cap_drop,
)
def start_container(self, container):
container.start()
return container

def start_or_create_containers(
Expand DownExpand Up@@ -389,7 +370,7 @@ def _get_net(self):

return net

def _get_container_create_options(self, override_options, one_off=False):
def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
container_options = dict(
(k, self.options[k])
for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -436,8 +417,47 @@ def _get_container_create_options(self, override_options, one_off=False):
for key in DOCKER_START_KEYS:
container_options.pop(key, None)

container_options['host_config'] = self._get_container_host_config(override_options, one_off=one_off, intermediate_container=intermediate_container)

return container_options

def _get_container_host_config(self, override_options, one_off=False, intermediate_container=None):
options = dict(self.options, **override_options)
port_bindings = build_port_bindings(options.get('ports') or [])

volume_bindings = dict(
build_volume_binding(parse_volume_spec(volume))
for volume in options.get('volumes') or []
if ':' in volume)

privileged = options.get('privileged', False)
cap_add = options.get('cap_add', None)
cap_drop = options.get('cap_drop', None)

dns = options.get('dns', None)
if not isinstance(dns, list):
dns = [dns]

dns_search = options.get('dns_search', None)
if not isinstance(dns_search, list):
dns_search = [dns_search]

restart = parse_restart_spec(options.get('restart', None))

return create_host_config(
links=self._get_links(link_to_self=one_off),
port_bindings=port_bindings,
binds=volume_bindings,
volumes_from=self._get_volumes_from(intermediate_container),
privileged=privileged,
network_mode=self._get_net(),
dns=dns,
dns_search=dns_search,
restart_policy=restart,
cap_add=cap_add,
cap_drop=cap_drop,
)

def _get_image_name(self, image):
repo, tag = parse_repository_tag(image)
if tag == "":
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/service_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@

def create_and_start_container(service, **override_options):
container = service.create_container(**override_options)
return service.start_container(container, **override_options)
return service.start_container(container)


class ServiceTest(DockerClientTestCase):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Make Swarm schedule containers on the same node when they are linked together by aanand · Pull Request #972 · docker/compose · GitHub
Skip to content
Make Swarm schedule containers on the same node when they are linked together#972

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 1 commit into

from

Mar 20, 2015
 Merged


Make Swarm schedule containers on the same node when they are linked together
#972
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
compose/cli/docker_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,4 +32,4 @@ def docker_client():
 )

 timeout = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
 return Client(base_url=base_url, tls=tls_config, version='1.14', timeout=timeout)
 return Client(base_url=base_url, tls=tls_config, version='1.15', timeout=timeout)

10 changes: 5 additions & 5 deletions
compose/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,20 +328,20 @@ def run(self, project, options):
 if options['--user']:
 container_options['user'] = options.get('--user')

 if not options['--service-ports']:
 container_options['ports'] = []

 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )

 service_ports = None
 if options['--service-ports']:
 service_ports = service.options['ports']
 if options['-d']:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
 print(container.name)
 else:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
@dnephindnephinMar 16, 2015

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor (since it's existing), this is being done in both branches of the is/else, so it should really happen before the branch.
 dockerpty.start(project.client, container.id, interactive=not options['-T'])
 exit_code = container.wait()
 if options['--rm']:
Expand Down

94 changes: 57 additions & 37 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import sys

from docker.errors import APIError
from docker.utils import create_host_config

from .config import DOCKER_CONFIG_KEYS
from .container import Container, get_container_name
Expand DownExpand Up@@ -168,14 +169,17 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
 intermediate_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off)
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
 self.can_be_built() and
Expand DownExpand Up@@ -240,56 +244,33 @@ def recreate_container(self, container, **override_options):
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start(volumes_from=container.id)
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 new_container = self.create_container(do_build=False, **options)
 self.start_container(new_container, intermediate_container=intermediate_container)
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)

 def start_container_if_stopped(self, container, **options):
 def start_container_if_stopped(self, container):
 if container.is_running:
 return container
 else:
 log.info("Starting %s..." % container.name)
 return self.start_container(container, **options)

 def start_container(self, container, intermediate_container=None, **override_options):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 dns = options.get('dns', None)
 dns_search = options.get('dns_search', None)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 restart = parse_restart_spec(options.get('restart', None))
 return self.start_container(container)

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )
 def start_container(self, container):
 container.start()
 return container

 def start_or_create_containers(
Expand DownExpand Up@@ -389,7 +370,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False):
 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -436,8 +417,47 @@ def _get_container_create_options(self, override_options, one_off=False):
 for key in DOCKER_START_KEYS:
 container_options.pop(key, None)

 container_options['host_config'] = self._get_container_host_config(override_options, one_off=one_off, intermediate_container=intermediate_container)

 return container_options

 def _get_container_host_config(self, override_options, one_off=False, intermediate_container=None):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 dns = options.get('dns', None)
 if not isinstance(dns, list):
 dns = [dns]

 dns_search = options.get('dns_search', None)
 if not isinstance(dns_search, list):
 dns_search = [dns_search]

 restart = parse_restart_spec(options.get('restart', None))

 return create_host_config(
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )

 def _get_image_name(self, image):
 repo, tag = parse_repository_tag(image)
 if tag == "":
Expand Down

2 changes: 1 addition & 1 deletion
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@

def create_and_start_container(service, **override_options):
 container = service.create_container(**override_options)
 return service.start_container(container, **override_options)
 return service.start_container(container)


class ServiceTest(DockerClientTestCase):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Make Swarm schedule containers on the same node when they are linked together by aanand · Pull Request #972 · docker/compose · GitHub
Skip to content
Make Swarm schedule containers on the same node when they are linked together#972

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 1 commit into

from

Mar 20, 2015
 Merged


Make Swarm schedule containers on the same node when they are linked together
#972
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
compose/cli/docker_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,4 +32,4 @@ def docker_client():
 )

 timeout = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
 return Client(base_url=base_url, tls=tls_config, version='1.14', timeout=timeout)
 return Client(base_url=base_url, tls=tls_config, version='1.15', timeout=timeout)

10 changes: 5 additions & 5 deletions
compose/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,20 +328,20 @@ def run(self, project, options):
 if options['--user']:
 container_options['user'] = options.get('--user')

 if not options['--service-ports']:
 container_options['ports'] = []

 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )

 service_ports = None
 if options['--service-ports']:
 service_ports = service.options['ports']
 if options['-d']:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
 print(container.name)
 else:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
@dnephindnephinMar 16, 2015

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor (since it's existing), this is being done in both branches of the is/else, so it should really happen before the branch.
 dockerpty.start(project.client, container.id, interactive=not options['-T'])
 exit_code = container.wait()
 if options['--rm']:
Expand Down

94 changes: 57 additions & 37 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import sys

from docker.errors import APIError
from docker.utils import create_host_config

from .config import DOCKER_CONFIG_KEYS
from .container import Container, get_container_name
Expand DownExpand Up@@ -168,14 +169,17 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
 intermediate_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off)
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
 self.can_be_built() and
Expand DownExpand Up@@ -240,56 +244,33 @@ def recreate_container(self, container, **override_options):
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start(volumes_from=container.id)
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 new_container = self.create_container(do_build=False, **options)
 self.start_container(new_container, intermediate_container=intermediate_container)
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)

 def start_container_if_stopped(self, container, **options):
 def start_container_if_stopped(self, container):
 if container.is_running:
 return container
 else:
 log.info("Starting %s..." % container.name)
 return self.start_container(container, **options)

 def start_container(self, container, intermediate_container=None, **override_options):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 dns = options.get('dns', None)
 dns_search = options.get('dns_search', None)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 restart = parse_restart_spec(options.get('restart', None))
 return self.start_container(container)

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )
 def start_container(self, container):
 container.start()
 return container

 def start_or_create_containers(
Expand DownExpand Up@@ -389,7 +370,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False):
 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -436,8 +417,47 @@ def _get_container_create_options(self, override_options, one_off=False):
 for key in DOCKER_START_KEYS:
 container_options.pop(key, None)

 container_options['host_config'] = self._get_container_host_config(override_options, one_off=one_off, intermediate_container=intermediate_container)

 return container_options

 def _get_container_host_config(self, override_options, one_off=False, intermediate_container=None):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 dns = options.get('dns', None)
 if not isinstance(dns, list):
 dns = [dns]

 dns_search = options.get('dns_search', None)
 if not isinstance(dns_search, list):
 dns_search = [dns_search]

 restart = parse_restart_spec(options.get('restart', None))

 return create_host_config(
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )

 def _get_image_name(self, image):
 repo, tag = parse_repository_tag(image)
 if tag == "":
Expand Down

2 changes: 1 addition & 1 deletion
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@

def create_and_start_container(service, **override_options):
 container = service.create_container(**override_options)
 return service.start_container(container, **override_options)
 return service.start_container(container)


class ServiceTest(DockerClientTestCase):
Expand Down

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

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 1 commit into

from

Mar 20, 2015
 Merged


Make Swarm schedule containers on the same node when they are linked together
#972
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
compose/cli/docker_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,4 +32,4 @@ def docker_client():
 )

 timeout = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
 return Client(base_url=base_url, tls=tls_config, version='1.14', timeout=timeout)
 return Client(base_url=base_url, tls=tls_config, version='1.15', timeout=timeout)

10 changes: 5 additions & 5 deletions
compose/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,20 +328,20 @@ def run(self, project, options):
 if options['--user']:
 container_options['user'] = options.get('--user')

 if not options['--service-ports']:
 container_options['ports'] = []

 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )

 service_ports = None
 if options['--service-ports']:
 service_ports = service.options['ports']
 if options['-d']:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
 print(container.name)
 else:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
@dnephindnephinMar 16, 2015

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor (since it's existing), this is being done in both branches of the is/else, so it should really happen before the branch.
 dockerpty.start(project.client, container.id, interactive=not options['-T'])
 exit_code = container.wait()
 if options['--rm']:
Expand Down

94 changes: 57 additions & 37 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import sys

from docker.errors import APIError
from docker.utils import create_host_config

from .config import DOCKER_CONFIG_KEYS
from .container import Container, get_container_name
Expand DownExpand Up@@ -168,14 +169,17 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
 intermediate_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off)
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
 self.can_be_built() and
Expand DownExpand Up@@ -240,56 +244,33 @@ def recreate_container(self, container, **override_options):
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start(volumes_from=container.id)
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 new_container = self.create_container(do_build=False, **options)
 self.start_container(new_container, intermediate_container=intermediate_container)
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)

 def start_container_if_stopped(self, container, **options):
 def start_container_if_stopped(self, container):
 if container.is_running:
 return container
 else:
 log.info("Starting %s..." % container.name)
 return self.start_container(container, **options)

 def start_container(self, container, intermediate_container=None, **override_options):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 dns = options.get('dns', None)
 dns_search = options.get('dns_search', None)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 restart = parse_restart_spec(options.get('restart', None))
 return self.start_container(container)

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )
 def start_container(self, container):
 container.start()
 return container

 def start_or_create_containers(
Expand DownExpand Up@@ -389,7 +370,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False):
 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -436,8 +417,47 @@ def _get_container_create_options(self, override_options, one_off=False):
 for key in DOCKER_START_KEYS:
 container_options.pop(key, None)

 container_options['host_config'] = self._get_container_host_config(override_options, one_off=one_off, intermediate_container=intermediate_container)

 return container_options

 def _get_container_host_config(self, override_options, one_off=False, intermediate_container=None):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 dns = options.get('dns', None)
 if not isinstance(dns, list):
 dns = [dns]

 dns_search = options.get('dns_search', None)
 if not isinstance(dns_search, list):
 dns_search = [dns_search]

 restart = parse_restart_spec(options.get('restart', None))

 return create_host_config(
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )

 def _get_image_name(self, image):
 repo, tag = parse_repository_tag(image)
 if tag == "":
Expand Down

2 changes: 1 addition & 1 deletion
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@

def create_and_start_container(service, **override_options):
 container = service.create_container(**override_options)
 return service.start_container(container, **override_options)
 return service.start_container(container)


class ServiceTest(DockerClientTestCase):
Expand Down

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

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 1 commit into

from

Mar 20, 2015
 Merged


Make Swarm schedule containers on the same node when they are linked together
#972
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
compose/cli/docker_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,4 +32,4 @@ def docker_client():
 )

 timeout = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
 return Client(base_url=base_url, tls=tls_config, version='1.14', timeout=timeout)
 return Client(base_url=base_url, tls=tls_config, version='1.15', timeout=timeout)

10 changes: 5 additions & 5 deletions
compose/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,20 +328,20 @@ def run(self, project, options):
 if options['--user']:
 container_options['user'] = options.get('--user')

 if not options['--service-ports']:
 container_options['ports'] = []

 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )

 service_ports = None
 if options['--service-ports']:
 service_ports = service.options['ports']
 if options['-d']:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
 print(container.name)
 else:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
@dnephindnephinMar 16, 2015

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor (since it's existing), this is being done in both branches of the is/else, so it should really happen before the branch.
 dockerpty.start(project.client, container.id, interactive=not options['-T'])
 exit_code = container.wait()
 if options['--rm']:
Expand Down

94 changes: 57 additions & 37 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import sys

from docker.errors import APIError
from docker.utils import create_host_config

from .config import DOCKER_CONFIG_KEYS
from .container import Container, get_container_name
Expand DownExpand Up@@ -168,14 +169,17 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
 intermediate_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off)
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
 self.can_be_built() and
Expand DownExpand Up@@ -240,56 +244,33 @@ def recreate_container(self, container, **override_options):
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start(volumes_from=container.id)
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 new_container = self.create_container(do_build=False, **options)
 self.start_container(new_container, intermediate_container=intermediate_container)
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)

 def start_container_if_stopped(self, container, **options):
 def start_container_if_stopped(self, container):
 if container.is_running:
 return container
 else:
 log.info("Starting %s..." % container.name)
 return self.start_container(container, **options)

 def start_container(self, container, intermediate_container=None, **override_options):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 dns = options.get('dns', None)
 dns_search = options.get('dns_search', None)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 restart = parse_restart_spec(options.get('restart', None))
 return self.start_container(container)

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )
 def start_container(self, container):
 container.start()
 return container

 def start_or_create_containers(
Expand DownExpand Up@@ -389,7 +370,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False):
 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -436,8 +417,47 @@ def _get_container_create_options(self, override_options, one_off=False):
 for key in DOCKER_START_KEYS:
 container_options.pop(key, None)

 container_options['host_config'] = self._get_container_host_config(override_options, one_off=one_off, intermediate_container=intermediate_container)

 return container_options

 def _get_container_host_config(self, override_options, one_off=False, intermediate_container=None):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 dns = options.get('dns', None)
 if not isinstance(dns, list):
 dns = [dns]

 dns_search = options.get('dns_search', None)
 if not isinstance(dns_search, list):
 dns_search = [dns_search]

 restart = parse_restart_spec(options.get('restart', None))

 return create_host_config(
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )

 def _get_image_name(self, image):
 repo, tag = parse_repository_tag(image)
 if tag == "":
Expand Down

2 changes: 1 addition & 1 deletion
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@

def create_and_start_container(service, **override_options):
 container = service.create_container(**override_options)
 return service.start_container(container, **override_options)
 return service.start_container(container)


class ServiceTest(DockerClientTestCase):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Make Swarm schedule containers on the same node when they are linked together by aanand · Pull Request #972 · docker/compose · GitHub
Skip to content
Make Swarm schedule containers on the same node when they are linked together#972

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 1 commit into

from

Mar 20, 2015
 Merged


Make Swarm schedule containers on the same node when they are linked together
#972
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
compose/cli/docker_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,4 +32,4 @@ def docker_client():
 )

 timeout = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
 return Client(base_url=base_url, tls=tls_config, version='1.14', timeout=timeout)
 return Client(base_url=base_url, tls=tls_config, version='1.15', timeout=timeout)

10 changes: 5 additions & 5 deletions
compose/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,20 +328,20 @@ def run(self, project, options):
 if options['--user']:
 container_options['user'] = options.get('--user')

 if not options['--service-ports']:
 container_options['ports'] = []

 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )

 service_ports = None
 if options['--service-ports']:
 service_ports = service.options['ports']
 if options['-d']:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
 print(container.name)
 else:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
@dnephindnephinMar 16, 2015

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor (since it's existing), this is being done in both branches of the is/else, so it should really happen before the branch.
 dockerpty.start(project.client, container.id, interactive=not options['-T'])
 exit_code = container.wait()
 if options['--rm']:
Expand Down

94 changes: 57 additions & 37 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import sys

from docker.errors import APIError
from docker.utils import create_host_config

from .config import DOCKER_CONFIG_KEYS
from .container import Container, get_container_name
Expand DownExpand Up@@ -168,14 +169,17 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
 intermediate_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off)
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
 self.can_be_built() and
Expand DownExpand Up@@ -240,56 +244,33 @@ def recreate_container(self, container, **override_options):
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start(volumes_from=container.id)
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 new_container = self.create_container(do_build=False, **options)
 self.start_container(new_container, intermediate_container=intermediate_container)
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)

 def start_container_if_stopped(self, container, **options):
 def start_container_if_stopped(self, container):
 if container.is_running:
 return container
 else:
 log.info("Starting %s..." % container.name)
 return self.start_container(container, **options)

 def start_container(self, container, intermediate_container=None, **override_options):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 dns = options.get('dns', None)
 dns_search = options.get('dns_search', None)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 restart = parse_restart_spec(options.get('restart', None))
 return self.start_container(container)

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )
 def start_container(self, container):
 container.start()
 return container

 def start_or_create_containers(
Expand DownExpand Up@@ -389,7 +370,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False):
 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -436,8 +417,47 @@ def _get_container_create_options(self, override_options, one_off=False):
 for key in DOCKER_START_KEYS:
 container_options.pop(key, None)

 container_options['host_config'] = self._get_container_host_config(override_options, one_off=one_off, intermediate_container=intermediate_container)

 return container_options

 def _get_container_host_config(self, override_options, one_off=False, intermediate_container=None):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 dns = options.get('dns', None)
 if not isinstance(dns, list):
 dns = [dns]

 dns_search = options.get('dns_search', None)
 if not isinstance(dns_search, list):
 dns_search = [dns_search]

 restart = parse_restart_spec(options.get('restart', None))

 return create_host_config(
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )

 def _get_image_name(self, image):
 repo, tag = parse_repository_tag(image)
 if tag == "":
Expand Down

2 changes: 1 addition & 1 deletion
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@

def create_and_start_container(service, **override_options):
 container = service.create_container(**override_options)
 return service.start_container(container, **override_options)
 return service.start_container(container)


class ServiceTest(DockerClientTestCase):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Make Swarm schedule containers on the same node when they are linked together by aanand · Pull Request #972 · docker/compose · GitHub
Skip to content
Make Swarm schedule containers on the same node when they are linked together#972

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 1 commit into

from

Mar 20, 2015
 Merged


Make Swarm schedule containers on the same node when they are linked together
#972
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
compose/cli/docker_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,4 +32,4 @@ def docker_client():
 )

 timeout = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
 return Client(base_url=base_url, tls=tls_config, version='1.14', timeout=timeout)
 return Client(base_url=base_url, tls=tls_config, version='1.15', timeout=timeout)

10 changes: 5 additions & 5 deletions
compose/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,20 +328,20 @@ def run(self, project, options):
 if options['--user']:
 container_options['user'] = options.get('--user')

 if not options['--service-ports']:
 container_options['ports'] = []

 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )

 service_ports = None
 if options['--service-ports']:
 service_ports = service.options['ports']
 if options['-d']:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
 print(container.name)
 else:
 service.start_container(container, ports=service_ports, one_off=True)
 service.start_container(container)
@dnephindnephinMar 16, 2015

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor (since it's existing), this is being done in both branches of the is/else, so it should really happen before the branch.
 dockerpty.start(project.client, container.id, interactive=not options['-T'])
 exit_code = container.wait()
 if options['--rm']:
Expand Down

94 changes: 57 additions & 37 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import sys

from docker.errors import APIError
from docker.utils import create_host_config

from .config import DOCKER_CONFIG_KEYS
from .container import Container, get_container_name
Expand DownExpand Up@@ -168,14 +169,17 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
 intermediate_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off)
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
 self.can_be_built() and
Expand DownExpand Up@@ -240,56 +244,33 @@ def recreate_container(self, container, **override_options):
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start(volumes_from=container.id)
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 new_container = self.create_container(do_build=False, **options)
 self.start_container(new_container, intermediate_container=intermediate_container)
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)

 def start_container_if_stopped(self, container, **options):
 def start_container_if_stopped(self, container):
 if container.is_running:
 return container
 else:
 log.info("Starting %s..." % container.name)
 return self.start_container(container, **options)

 def start_container(self, container, intermediate_container=None, **override_options):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 dns = options.get('dns', None)
 dns_search = options.get('dns_search', None)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 restart = parse_restart_spec(options.get('restart', None))
 return self.start_container(container)

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )
 def start_container(self, container):
 container.start()
 return container

 def start_or_create_containers(
Expand DownExpand Up@@ -389,7 +370,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False):
 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -436,8 +417,47 @@ def _get_container_create_options(self, override_options, one_off=False):
 for key in DOCKER_START_KEYS:
 container_options.pop(key, None)

 container_options['host_config'] = self._get_container_host_config(override_options, one_off=one_off, intermediate_container=intermediate_container)

 return container_options

 def _get_container_host_config(self, override_options, one_off=False, intermediate_container=None):
 options = dict(self.options, **override_options)
 port_bindings = build_port_bindings(options.get('ports') or [])

 volume_bindings = dict(
 build_volume_binding(parse_volume_spec(volume))
 for volume in options.get('volumes') or []
 if ':' in volume)

 privileged = options.get('privileged', False)
 cap_add = options.get('cap_add', None)
 cap_drop = options.get('cap_drop', None)

 dns = options.get('dns', None)
 if not isinstance(dns, list):
 dns = [dns]

 dns_search = options.get('dns_search', None)
 if not isinstance(dns_search, list):
 dns_search = [dns_search]

 restart = parse_restart_spec(options.get('restart', None))

 return create_host_config(
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
 dns_search=dns_search,
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 )

 def _get_image_name(self, image):
 repo, tag = parse_repository_tag(image)
 if tag == "":
Expand Down

2 changes: 1 addition & 1 deletion
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@

def create_and_start_container(service, **override_options):
 container = service.create_container(**override_options)
 return service.start_container(container, **override_options)
 return service.start_container(container)


class ServiceTest(DockerClientTestCase):
Expand Down