Rename container when recreating it#1349

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
May 8, 2015
Merged

Rename container when recreating it #1349

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
18 changes: 8 additions & 10 deletions compose/project.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -202,17 +202,15 @@ def up(self,
running_containers = []
for service in self.get_services(service_names, include_deps=start_deps):
if recreate:
for (_, container) in service.recreate_containers(
insecure_registry=insecure_registry,
detach=detach,
do_build=do_build):
running_containers.append(container)
create_func = service.recreate_containers
else:
for container in service.start_or_create_containers(
insecure_registry=insecure_registry,
detach=detach,
do_build=do_build):
running_containers.append(container)
create_func = service.start_or_create_containers

for container in create_func(
insecure_registry=insecure_registry,
detach=detach,
do_build=do_build):
running_containers.append(container)

return running_containers

Expand Down
74 changes: 34 additions & 40 deletions compose/service.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
'pid',
'privileged',
'restart',
'volumes_from',
]

VALID_NAME_CHARS = '[a-zA-Z0-9]'
Expand DownExpand Up@@ -175,16 +176,16 @@ def create_container(self,
one_off=False,
insecure_registry=False,
do_build=True,
intermediate_container=None,
previous_container=None,
**override_options):
"""
Create a container for this service. If the image doesn't exist, attempt to pull
it.
"""
override_options['volumes_from'] = self._get_volumes_from(previous_container)
container_options = self._get_container_create_options(
override_options,
one_off=one_off,
intermediate_container=intermediate_container,
)

if (do_build and
Expand DownExpand Up@@ -213,21 +214,24 @@ def recreate_containers(self, insecure_registry=False, do_build=True, **override
do_build=do_build,
**override_options)
self.start_container(container)
return [(None, container)]
else:
tuples = []

for c in containers:
log.info("Recreating %s..." % c.name)
tuples.append(self.recreate_container(c, insecure_registry=insecure_registry, **override_options))
return [container]

return tuples
return [
self.recreate_container(
c,
insecure_registry=insecure_registry,
**override_options)
for c in containers
]

def recreate_container(self, container, **override_options):
"""Recreate a container. An intermediate container is created so that
the new container has the same name, while still supporting
`volumes-from` the original container.
"""Recreate a container.

The original container is renamed to a temporary name so that data
volumes can be copied to the new container, before the original
container is removed.
"""
log.info("Recreating %s..." % container.name)
try:
container.stop()
except APIError as e:
Expand All@@ -238,29 +242,17 @@ def recreate_container(self, container, **override_options):
else:
raise

intermediate_container = Container.create(
self.client,
image=container.image,
entrypoint=['/bin/echo'],
command=[],
detach=True,
host_config=create_host_config(volumes_from=[container.id]),
)
intermediate_container.start()
intermediate_container.wait()
container.remove()

options = dict(override_options)
# Use a hopefully unique container name by prepending the short id
self.client.rename(
container.id,
'%s_%s' % (container.short_id, container.name))
new_container = self.create_container(
do_build=False,
intermediate_container=intermediate_container,
**options
)
previous_container=container,
**override_options)
self.start_container(new_container)

intermediate_container.remove()

return (intermediate_container, new_container)
container.remove()
return new_container

def start_container_if_stopped(self, container):
if container.is_running:
Expand DownExpand Up@@ -333,7 +325,7 @@ def _get_links(self, link_to_self):
links.append((external_link, link_name))
return links

def _get_volumes_from(self, intermediate_container=None):
def _get_volumes_from(self, previous_container=None):
volumes_from = []
for volume_source in self.volumes_from:
if isinstance(volume_source, Service):
Expand All@@ -346,8 +338,8 @@ def _get_volumes_from(self, intermediate_container=None):
elif isinstance(volume_source, Container):
volumes_from.append(volume_source.id)

if intermediate_container:
volumes_from.append(intermediate_container.id)
if previous_container:
volumes_from.append(previous_container.id)

return volumes_from

Expand All@@ -370,7 +362,7 @@ def _get_net(self):

return net

def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
def _get_container_create_options(self, override_options, one_off=False):
container_options = dict(
(k, self.options[k])
for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -415,11 +407,13 @@ def _get_container_create_options(self, override_options, one_off=False, interme
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)
container_options['host_config'] = self._get_container_host_config(
override_options,
one_off=one_off)

return container_options

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

Expand DownExpand Up@@ -451,7 +445,7 @@ def _get_container_host_config(self, override_options, one_off=False, intermedia
links=self._get_links(link_to_self=one_off),
port_bindings=port_bindings,
binds=volume_bindings,
volumes_from=self._get_volumes_from(intermediate_container),
volumes_from=options.get('volumes_from'),
privileged=privileged,
network_mode=self._get_net(),
dns=dns,
Expand Down
11 changes: 3 additions & 8 deletions tests/integration/service_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -249,25 +249,20 @@ def test_recreate_containers(self):
num_containers_before = len(self.client.containers(all=True))

service.options['environment']['FOO'] = '2'
tuples = service.recreate_containers()
self.assertEqual(len(tuples), 1)

intermediate_container = tuples[0][0]
new_container = tuples[0][1]
self.assertEqual(intermediate_container.dictionary['Config']['Entrypoint'], ['/bin/echo'])
new_container, = service.recreate_containers()

self.assertEqual(new_container.dictionary['Config']['Entrypoint'], ['sleep'])
self.assertEqual(new_container.dictionary['Config']['Cmd'], ['300'])
self.assertIn('FOO=2', new_container.dictionary['Config']['Env'])
self.assertEqual(new_container.name, 'composetest_db_1')
self.assertEqual(new_container.inspect()['Volumes']['/etc'], volume_path)
self.assertIn(intermediate_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])
self.assertIn(old_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])

self.assertEqual(len(self.client.containers(all=True)), num_containers_before)
self.assertNotEqual(old_container.id, new_container.id)
self.assertRaises(APIError,
self.client.inspect_container,
intermediate_container.id)
old_container.id)

def test_recreate_containers_when_containers_are_stopped(self):
service = self.create_service(
Expand Down
16 changes: 15 additions & 1 deletion tests/unit/service_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ def test_get_volumes_from_container(self):

self.assertEqual(service._get_volumes_from(), [container_id])

def test_get_volumes_from_intermediate_container(self):
def test_get_volumes_from_previous_container(self):
container_id = 'aabbccddee'
service = Service('test', image='foo')
container = mock.Mock(id=container_id, spec=Container, image='foo')
Expand DownExpand Up@@ -263,6 +263,20 @@ def test_create_container_from_insecure_registry(
mock_log.info.assert_called_once_with(
'Pulling foo (someimage:sometag)...')

@mock.patch('compose.service.Container', autospec=True)
def test_recreate_container(self, _):
mock_container = mock.create_autospec(Container)
service = Service('foo', client=self.mock_client, image='someimage')
new_container = service.recreate_container(mock_container)

mock_container.stop.assert_called_once_with()
self.mock_client.rename.assert_called_once_with(
mock_container.id,
'%s_%s' % (mock_container.short_id, mock_container.name))

new_container.start.assert_called_once_with()
mock_container.remove.assert_called_once_with()

def test_parse_repository_tag(self):
self.assertEqual(parse_repository_tag("root"), ("root", ""))
self.assertEqual(parse_repository_tag("root:tag"), ("root", "tag"))
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
Rename container when recreating it#1349

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

May 8, 2015
 Merged


Rename container when recreating it
#1349
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


18 changes: 8 additions & 10 deletions
compose/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,17 +202,15 @@ def up(self,
 running_containers = []
 for service in self.get_services(service_names, include_deps=start_deps):
 if recreate:
 for (_, container) in service.recreate_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.recreate_containers
 else:
 for container in service.start_or_create_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.start_or_create_containers

 for container in create_func(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)

 return running_containers

Expand Down

74 changes: 34 additions & 40 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
 'pid',
 'privileged',
 'restart',
 'volumes_from',
]

VALID_NAME_CHARS = '[a-zA-Z0-9]'
Expand DownExpand Up@@ -175,16 +176,16 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
intermediate_container=None,
previous_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 override_options['volumes_from'] = self._get_volumes_from(previous_container)
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
Expand DownExpand Up@@ -213,21 +214,24 @@ def recreate_containers(self, insecure_registry=False, do_build=True, **override
 do_build=do_build,
 **override_options)
 self.start_container(container)
 return [(None, container)]
 else:
 tuples = []

 for c in containers:
 log.info("Recreating %s..." % c.name)
 tuples.append(self.recreate_container(c, insecure_registry=insecure_registry, **override_options))
 return [container]

 return tuples
 return [
 self.recreate_container(
 c,
 insecure_registry=insecure_registry,
 **override_options)
 for c in containers
 ]

 def recreate_container(self, container, **override_options):
 """Recreate a container. An intermediate container is created so that
 the new container has the same name, while still supporting
 `volumes-from` the original container.
 """Recreate a container.

 The original container is renamed to a temporary name so that data
 volumes can be copied to the new container, before the original
 container is removed.
 """
 log.info("Recreating %s..." % container.name)
 try:
 container.stop()
 except APIError as e:
Expand All@@ -238,29 +242,17 @@ def recreate_container(self, container, **override_options):
 else:
 raise

 intermediate_container = Container.create(
 self.client,
 image=container.image,
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 # Use a hopefully unique container name by prepending the short id
 self.client.rename(
 container.id,
 '%s_%s' % (container.short_id, container.name))
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 previous_container=container,
 **override_options)
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)
 container.remove()
 return new_container

 def start_container_if_stopped(self, container):
 if container.is_running:
Expand DownExpand Up@@ -333,7 +325,7 @@ def _get_links(self, link_to_self):
 links.append((external_link, link_name))
 return links

 def _get_volumes_from(self, intermediate_container=None):
 def _get_volumes_from(self, previous_container=None):
 volumes_from = []
 for volume_source in self.volumes_from:
 if isinstance(volume_source, Service):
Expand All@@ -346,8 +338,8 @@ def _get_volumes_from(self, intermediate_container=None):
 elif isinstance(volume_source, Container):
 volumes_from.append(volume_source.id)

 if intermediate_container:
 volumes_from.append(intermediate_container.id)
 if previous_container:
 volumes_from.append(previous_container.id)

 return volumes_from

Expand All@@ -370,7 +362,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 def _get_container_create_options(self, override_options, one_off=False):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -415,11 +407,13 @@ def _get_container_create_options(self, override_options, one_off=False, interme
 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)
 container_options['host_config'] = self._get_container_host_config(
 override_options,
 one_off=one_off)

 return container_options

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

Expand DownExpand Up@@ -451,7 +445,7 @@ def _get_container_host_config(self, override_options, one_off=False, intermedia
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 volumes_from=options.get('volumes_from'),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
Expand Down

11 changes: 3 additions & 8 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -249,25 +249,20 @@ def test_recreate_containers(self):
 num_containers_before = len(self.client.containers(all=True))

 service.options['environment']['FOO'] = '2'
 tuples = service.recreate_containers()
 self.assertEqual(len(tuples), 1)

 intermediate_container = tuples[0][0]
 new_container = tuples[0][1]
 self.assertEqual(intermediate_container.dictionary['Config']['Entrypoint'], ['/bin/echo'])
 new_container, = service.recreate_containers()

 self.assertEqual(new_container.dictionary['Config']['Entrypoint'], ['sleep'])
 self.assertEqual(new_container.dictionary['Config']['Cmd'], ['300'])
 self.assertIn('FOO=2', new_container.dictionary['Config']['Env'])
 self.assertEqual(new_container.name, 'composetest_db_1')
 self.assertEqual(new_container.inspect()['Volumes']['/etc'], volume_path)
 self.assertIn(intermediate_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])
 self.assertIn(old_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])

 self.assertEqual(len(self.client.containers(all=True)), num_containers_before)
 self.assertNotEqual(old_container.id, new_container.id)
 self.assertRaises(APIError,
 self.client.inspect_container,
intermediate_container.id)
old_container.id)

 def test_recreate_containers_when_containers_are_stopped(self):
 service = self.create_service(
Expand Down

16 changes: 15 additions & 1 deletion
tests/unit/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ def test_get_volumes_from_container(self):

 self.assertEqual(service._get_volumes_from(), [container_id])

 def test_get_volumes_from_intermediate_container(self):
 def test_get_volumes_from_previous_container(self):
 container_id = 'aabbccddee'
 service = Service('test', image='foo')
 container = mock.Mock(id=container_id, spec=Container, image='foo')
Expand DownExpand Up@@ -263,6 +263,20 @@ def test_create_container_from_insecure_registry(
 mock_log.info.assert_called_once_with(
 'Pulling foo (someimage:sometag)...')

 @mock.patch('compose.service.Container', autospec=True)
 def test_recreate_container(self, _):
 mock_container = mock.create_autospec(Container)
 service = Service('foo', client=self.mock_client, image='someimage')
 new_container = service.recreate_container(mock_container)

 mock_container.stop.assert_called_once_with()
 self.mock_client.rename.assert_called_once_with(
 mock_container.id,
 '%s_%s' % (mock_container.short_id, mock_container.name))

 new_container.start.assert_called_once_with()
 mock_container.remove.assert_called_once_with()

 def test_parse_repository_tag(self):
 self.assertEqual(parse_repository_tag("root"), ("root", ""))
 self.assertEqual(parse_repository_tag("root:tag"), ("root", "tag"))
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
Rename container when recreating it#1349

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

May 8, 2015
 Merged


Rename container when recreating it
#1349
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


18 changes: 8 additions & 10 deletions
compose/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,17 +202,15 @@ def up(self,
 running_containers = []
 for service in self.get_services(service_names, include_deps=start_deps):
 if recreate:
 for (_, container) in service.recreate_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.recreate_containers
 else:
 for container in service.start_or_create_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.start_or_create_containers

 for container in create_func(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)

 return running_containers

Expand Down

74 changes: 34 additions & 40 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
 'pid',
 'privileged',
 'restart',
 'volumes_from',
]

VALID_NAME_CHARS = '[a-zA-Z0-9]'
Expand DownExpand Up@@ -175,16 +176,16 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
intermediate_container=None,
previous_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 override_options['volumes_from'] = self._get_volumes_from(previous_container)
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
Expand DownExpand Up@@ -213,21 +214,24 @@ def recreate_containers(self, insecure_registry=False, do_build=True, **override
 do_build=do_build,
 **override_options)
 self.start_container(container)
 return [(None, container)]
 else:
 tuples = []

 for c in containers:
 log.info("Recreating %s..." % c.name)
 tuples.append(self.recreate_container(c, insecure_registry=insecure_registry, **override_options))
 return [container]

 return tuples
 return [
 self.recreate_container(
 c,
 insecure_registry=insecure_registry,
 **override_options)
 for c in containers
 ]

 def recreate_container(self, container, **override_options):
 """Recreate a container. An intermediate container is created so that
 the new container has the same name, while still supporting
 `volumes-from` the original container.
 """Recreate a container.

 The original container is renamed to a temporary name so that data
 volumes can be copied to the new container, before the original
 container is removed.
 """
 log.info("Recreating %s..." % container.name)
 try:
 container.stop()
 except APIError as e:
Expand All@@ -238,29 +242,17 @@ def recreate_container(self, container, **override_options):
 else:
 raise

 intermediate_container = Container.create(
 self.client,
 image=container.image,
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 # Use a hopefully unique container name by prepending the short id
 self.client.rename(
 container.id,
 '%s_%s' % (container.short_id, container.name))
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 previous_container=container,
 **override_options)
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)
 container.remove()
 return new_container

 def start_container_if_stopped(self, container):
 if container.is_running:
Expand DownExpand Up@@ -333,7 +325,7 @@ def _get_links(self, link_to_self):
 links.append((external_link, link_name))
 return links

 def _get_volumes_from(self, intermediate_container=None):
 def _get_volumes_from(self, previous_container=None):
 volumes_from = []
 for volume_source in self.volumes_from:
 if isinstance(volume_source, Service):
Expand All@@ -346,8 +338,8 @@ def _get_volumes_from(self, intermediate_container=None):
 elif isinstance(volume_source, Container):
 volumes_from.append(volume_source.id)

 if intermediate_container:
 volumes_from.append(intermediate_container.id)
 if previous_container:
 volumes_from.append(previous_container.id)

 return volumes_from

Expand All@@ -370,7 +362,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 def _get_container_create_options(self, override_options, one_off=False):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -415,11 +407,13 @@ def _get_container_create_options(self, override_options, one_off=False, interme
 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)
 container_options['host_config'] = self._get_container_host_config(
 override_options,
 one_off=one_off)

 return container_options

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

Expand DownExpand Up@@ -451,7 +445,7 @@ def _get_container_host_config(self, override_options, one_off=False, intermedia
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 volumes_from=options.get('volumes_from'),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
Expand Down

11 changes: 3 additions & 8 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -249,25 +249,20 @@ def test_recreate_containers(self):
 num_containers_before = len(self.client.containers(all=True))

 service.options['environment']['FOO'] = '2'
 tuples = service.recreate_containers()
 self.assertEqual(len(tuples), 1)

 intermediate_container = tuples[0][0]
 new_container = tuples[0][1]
 self.assertEqual(intermediate_container.dictionary['Config']['Entrypoint'], ['/bin/echo'])
 new_container, = service.recreate_containers()

 self.assertEqual(new_container.dictionary['Config']['Entrypoint'], ['sleep'])
 self.assertEqual(new_container.dictionary['Config']['Cmd'], ['300'])
 self.assertIn('FOO=2', new_container.dictionary['Config']['Env'])
 self.assertEqual(new_container.name, 'composetest_db_1')
 self.assertEqual(new_container.inspect()['Volumes']['/etc'], volume_path)
 self.assertIn(intermediate_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])
 self.assertIn(old_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])

 self.assertEqual(len(self.client.containers(all=True)), num_containers_before)
 self.assertNotEqual(old_container.id, new_container.id)
 self.assertRaises(APIError,
 self.client.inspect_container,
intermediate_container.id)
old_container.id)

 def test_recreate_containers_when_containers_are_stopped(self):
 service = self.create_service(
Expand Down

16 changes: 15 additions & 1 deletion
tests/unit/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ def test_get_volumes_from_container(self):

 self.assertEqual(service._get_volumes_from(), [container_id])

 def test_get_volumes_from_intermediate_container(self):
 def test_get_volumes_from_previous_container(self):
 container_id = 'aabbccddee'
 service = Service('test', image='foo')
 container = mock.Mock(id=container_id, spec=Container, image='foo')
Expand DownExpand Up@@ -263,6 +263,20 @@ def test_create_container_from_insecure_registry(
 mock_log.info.assert_called_once_with(
 'Pulling foo (someimage:sometag)...')

 @mock.patch('compose.service.Container', autospec=True)
 def test_recreate_container(self, _):
 mock_container = mock.create_autospec(Container)
 service = Service('foo', client=self.mock_client, image='someimage')
 new_container = service.recreate_container(mock_container)

 mock_container.stop.assert_called_once_with()
 self.mock_client.rename.assert_called_once_with(
 mock_container.id,
 '%s_%s' % (mock_container.short_id, mock_container.name))

 new_container.start.assert_called_once_with()
 mock_container.remove.assert_called_once_with()

 def test_parse_repository_tag(self):
 self.assertEqual(parse_repository_tag("root"), ("root", ""))
 self.assertEqual(parse_repository_tag("root:tag"), ("root", "tag"))
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
Rename container when recreating it#1349

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

May 8, 2015
 Merged


Rename container when recreating it
#1349
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


18 changes: 8 additions & 10 deletions
compose/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,17 +202,15 @@ def up(self,
 running_containers = []
 for service in self.get_services(service_names, include_deps=start_deps):
 if recreate:
 for (_, container) in service.recreate_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.recreate_containers
 else:
 for container in service.start_or_create_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.start_or_create_containers

 for container in create_func(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)

 return running_containers

Expand Down

74 changes: 34 additions & 40 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
 'pid',
 'privileged',
 'restart',
 'volumes_from',
]

VALID_NAME_CHARS = '[a-zA-Z0-9]'
Expand DownExpand Up@@ -175,16 +176,16 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
intermediate_container=None,
previous_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 override_options['volumes_from'] = self._get_volumes_from(previous_container)
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
Expand DownExpand Up@@ -213,21 +214,24 @@ def recreate_containers(self, insecure_registry=False, do_build=True, **override
 do_build=do_build,
 **override_options)
 self.start_container(container)
 return [(None, container)]
 else:
 tuples = []

 for c in containers:
 log.info("Recreating %s..." % c.name)
 tuples.append(self.recreate_container(c, insecure_registry=insecure_registry, **override_options))
 return [container]

 return tuples
 return [
 self.recreate_container(
 c,
 insecure_registry=insecure_registry,
 **override_options)
 for c in containers
 ]

 def recreate_container(self, container, **override_options):
 """Recreate a container. An intermediate container is created so that
 the new container has the same name, while still supporting
 `volumes-from` the original container.
 """Recreate a container.

 The original container is renamed to a temporary name so that data
 volumes can be copied to the new container, before the original
 container is removed.
 """
 log.info("Recreating %s..." % container.name)
 try:
 container.stop()
 except APIError as e:
Expand All@@ -238,29 +242,17 @@ def recreate_container(self, container, **override_options):
 else:
 raise

 intermediate_container = Container.create(
 self.client,
 image=container.image,
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 # Use a hopefully unique container name by prepending the short id
 self.client.rename(
 container.id,
 '%s_%s' % (container.short_id, container.name))
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 previous_container=container,
 **override_options)
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)
 container.remove()
 return new_container

 def start_container_if_stopped(self, container):
 if container.is_running:
Expand DownExpand Up@@ -333,7 +325,7 @@ def _get_links(self, link_to_self):
 links.append((external_link, link_name))
 return links

 def _get_volumes_from(self, intermediate_container=None):
 def _get_volumes_from(self, previous_container=None):
 volumes_from = []
 for volume_source in self.volumes_from:
 if isinstance(volume_source, Service):
Expand All@@ -346,8 +338,8 @@ def _get_volumes_from(self, intermediate_container=None):
 elif isinstance(volume_source, Container):
 volumes_from.append(volume_source.id)

 if intermediate_container:
 volumes_from.append(intermediate_container.id)
 if previous_container:
 volumes_from.append(previous_container.id)

 return volumes_from

Expand All@@ -370,7 +362,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 def _get_container_create_options(self, override_options, one_off=False):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -415,11 +407,13 @@ def _get_container_create_options(self, override_options, one_off=False, interme
 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)
 container_options['host_config'] = self._get_container_host_config(
 override_options,
 one_off=one_off)

 return container_options

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

Expand DownExpand Up@@ -451,7 +445,7 @@ def _get_container_host_config(self, override_options, one_off=False, intermedia
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 volumes_from=options.get('volumes_from'),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
Expand Down

11 changes: 3 additions & 8 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -249,25 +249,20 @@ def test_recreate_containers(self):
 num_containers_before = len(self.client.containers(all=True))

 service.options['environment']['FOO'] = '2'
 tuples = service.recreate_containers()
 self.assertEqual(len(tuples), 1)

 intermediate_container = tuples[0][0]
 new_container = tuples[0][1]
 self.assertEqual(intermediate_container.dictionary['Config']['Entrypoint'], ['/bin/echo'])
 new_container, = service.recreate_containers()

 self.assertEqual(new_container.dictionary['Config']['Entrypoint'], ['sleep'])
 self.assertEqual(new_container.dictionary['Config']['Cmd'], ['300'])
 self.assertIn('FOO=2', new_container.dictionary['Config']['Env'])
 self.assertEqual(new_container.name, 'composetest_db_1')
 self.assertEqual(new_container.inspect()['Volumes']['/etc'], volume_path)
 self.assertIn(intermediate_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])
 self.assertIn(old_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])

 self.assertEqual(len(self.client.containers(all=True)), num_containers_before)
 self.assertNotEqual(old_container.id, new_container.id)
 self.assertRaises(APIError,
 self.client.inspect_container,
intermediate_container.id)
old_container.id)

 def test_recreate_containers_when_containers_are_stopped(self):
 service = self.create_service(
Expand Down

16 changes: 15 additions & 1 deletion
tests/unit/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ def test_get_volumes_from_container(self):

 self.assertEqual(service._get_volumes_from(), [container_id])

 def test_get_volumes_from_intermediate_container(self):
 def test_get_volumes_from_previous_container(self):
 container_id = 'aabbccddee'
 service = Service('test', image='foo')
 container = mock.Mock(id=container_id, spec=Container, image='foo')
Expand DownExpand Up@@ -263,6 +263,20 @@ def test_create_container_from_insecure_registry(
 mock_log.info.assert_called_once_with(
 'Pulling foo (someimage:sometag)...')

 @mock.patch('compose.service.Container', autospec=True)
 def test_recreate_container(self, _):
 mock_container = mock.create_autospec(Container)
 service = Service('foo', client=self.mock_client, image='someimage')
 new_container = service.recreate_container(mock_container)

 mock_container.stop.assert_called_once_with()
 self.mock_client.rename.assert_called_once_with(
 mock_container.id,
 '%s_%s' % (mock_container.short_id, mock_container.name))

 new_container.start.assert_called_once_with()
 mock_container.remove.assert_called_once_with()

 def test_parse_repository_tag(self):
 self.assertEqual(parse_repository_tag("root"), ("root", ""))
 self.assertEqual(parse_repository_tag("root:tag"), ("root", "tag"))
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
Rename container when recreating it#1349

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

May 8, 2015
 Merged


Rename container when recreating it
#1349
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


18 changes: 8 additions & 10 deletions
compose/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,17 +202,15 @@ def up(self,
 running_containers = []
 for service in self.get_services(service_names, include_deps=start_deps):
 if recreate:
 for (_, container) in service.recreate_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.recreate_containers
 else:
 for container in service.start_or_create_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.start_or_create_containers

 for container in create_func(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)

 return running_containers

Expand Down

74 changes: 34 additions & 40 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
 'pid',
 'privileged',
 'restart',
 'volumes_from',
]

VALID_NAME_CHARS = '[a-zA-Z0-9]'
Expand DownExpand Up@@ -175,16 +176,16 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
intermediate_container=None,
previous_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 override_options['volumes_from'] = self._get_volumes_from(previous_container)
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
Expand DownExpand Up@@ -213,21 +214,24 @@ def recreate_containers(self, insecure_registry=False, do_build=True, **override
 do_build=do_build,
 **override_options)
 self.start_container(container)
 return [(None, container)]
 else:
 tuples = []

 for c in containers:
 log.info("Recreating %s..." % c.name)
 tuples.append(self.recreate_container(c, insecure_registry=insecure_registry, **override_options))
 return [container]

 return tuples
 return [
 self.recreate_container(
 c,
 insecure_registry=insecure_registry,
 **override_options)
 for c in containers
 ]

 def recreate_container(self, container, **override_options):
 """Recreate a container. An intermediate container is created so that
 the new container has the same name, while still supporting
 `volumes-from` the original container.
 """Recreate a container.

 The original container is renamed to a temporary name so that data
 volumes can be copied to the new container, before the original
 container is removed.
 """
 log.info("Recreating %s..." % container.name)
 try:
 container.stop()
 except APIError as e:
Expand All@@ -238,29 +242,17 @@ def recreate_container(self, container, **override_options):
 else:
 raise

 intermediate_container = Container.create(
 self.client,
 image=container.image,
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 # Use a hopefully unique container name by prepending the short id
 self.client.rename(
 container.id,
 '%s_%s' % (container.short_id, container.name))
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 previous_container=container,
 **override_options)
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)
 container.remove()
 return new_container

 def start_container_if_stopped(self, container):
 if container.is_running:
Expand DownExpand Up@@ -333,7 +325,7 @@ def _get_links(self, link_to_self):
 links.append((external_link, link_name))
 return links

 def _get_volumes_from(self, intermediate_container=None):
 def _get_volumes_from(self, previous_container=None):
 volumes_from = []
 for volume_source in self.volumes_from:
 if isinstance(volume_source, Service):
Expand All@@ -346,8 +338,8 @@ def _get_volumes_from(self, intermediate_container=None):
 elif isinstance(volume_source, Container):
 volumes_from.append(volume_source.id)

 if intermediate_container:
 volumes_from.append(intermediate_container.id)
 if previous_container:
 volumes_from.append(previous_container.id)

 return volumes_from

Expand All@@ -370,7 +362,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 def _get_container_create_options(self, override_options, one_off=False):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -415,11 +407,13 @@ def _get_container_create_options(self, override_options, one_off=False, interme
 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)
 container_options['host_config'] = self._get_container_host_config(
 override_options,
 one_off=one_off)

 return container_options

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

Expand DownExpand Up@@ -451,7 +445,7 @@ def _get_container_host_config(self, override_options, one_off=False, intermedia
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 volumes_from=options.get('volumes_from'),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
Expand Down

11 changes: 3 additions & 8 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -249,25 +249,20 @@ def test_recreate_containers(self):
 num_containers_before = len(self.client.containers(all=True))

 service.options['environment']['FOO'] = '2'
 tuples = service.recreate_containers()
 self.assertEqual(len(tuples), 1)

 intermediate_container = tuples[0][0]
 new_container = tuples[0][1]
 self.assertEqual(intermediate_container.dictionary['Config']['Entrypoint'], ['/bin/echo'])
 new_container, = service.recreate_containers()

 self.assertEqual(new_container.dictionary['Config']['Entrypoint'], ['sleep'])
 self.assertEqual(new_container.dictionary['Config']['Cmd'], ['300'])
 self.assertIn('FOO=2', new_container.dictionary['Config']['Env'])
 self.assertEqual(new_container.name, 'composetest_db_1')
 self.assertEqual(new_container.inspect()['Volumes']['/etc'], volume_path)
 self.assertIn(intermediate_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])
 self.assertIn(old_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])

 self.assertEqual(len(self.client.containers(all=True)), num_containers_before)
 self.assertNotEqual(old_container.id, new_container.id)
 self.assertRaises(APIError,
 self.client.inspect_container,
intermediate_container.id)
old_container.id)

 def test_recreate_containers_when_containers_are_stopped(self):
 service = self.create_service(
Expand Down

16 changes: 15 additions & 1 deletion
tests/unit/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ def test_get_volumes_from_container(self):

 self.assertEqual(service._get_volumes_from(), [container_id])

 def test_get_volumes_from_intermediate_container(self):
 def test_get_volumes_from_previous_container(self):
 container_id = 'aabbccddee'
 service = Service('test', image='foo')
 container = mock.Mock(id=container_id, spec=Container, image='foo')
Expand DownExpand Up@@ -263,6 +263,20 @@ def test_create_container_from_insecure_registry(
 mock_log.info.assert_called_once_with(
 'Pulling foo (someimage:sometag)...')

 @mock.patch('compose.service.Container', autospec=True)
 def test_recreate_container(self, _):
 mock_container = mock.create_autospec(Container)
 service = Service('foo', client=self.mock_client, image='someimage')
 new_container = service.recreate_container(mock_container)

 mock_container.stop.assert_called_once_with()
 self.mock_client.rename.assert_called_once_with(
 mock_container.id,
 '%s_%s' % (mock_container.short_id, mock_container.name))

 new_container.start.assert_called_once_with()
 mock_container.remove.assert_called_once_with()

 def test_parse_repository_tag(self):
 self.assertEqual(parse_repository_tag("root"), ("root", ""))
 self.assertEqual(parse_repository_tag("root:tag"), ("root", "tag"))
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
Rename container when recreating it#1349

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

May 8, 2015
 Merged


Rename container when recreating it
#1349
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


18 changes: 8 additions & 10 deletions
compose/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,17 +202,15 @@ def up(self,
 running_containers = []
 for service in self.get_services(service_names, include_deps=start_deps):
 if recreate:
 for (_, container) in service.recreate_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.recreate_containers
 else:
 for container in service.start_or_create_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.start_or_create_containers

 for container in create_func(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)

 return running_containers

Expand Down

74 changes: 34 additions & 40 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
 'pid',
 'privileged',
 'restart',
 'volumes_from',
]

VALID_NAME_CHARS = '[a-zA-Z0-9]'
Expand DownExpand Up@@ -175,16 +176,16 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
intermediate_container=None,
previous_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 override_options['volumes_from'] = self._get_volumes_from(previous_container)
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
Expand DownExpand Up@@ -213,21 +214,24 @@ def recreate_containers(self, insecure_registry=False, do_build=True, **override
 do_build=do_build,
 **override_options)
 self.start_container(container)
 return [(None, container)]
 else:
 tuples = []

 for c in containers:
 log.info("Recreating %s..." % c.name)
 tuples.append(self.recreate_container(c, insecure_registry=insecure_registry, **override_options))
 return [container]

 return tuples
 return [
 self.recreate_container(
 c,
 insecure_registry=insecure_registry,
 **override_options)
 for c in containers
 ]

 def recreate_container(self, container, **override_options):
 """Recreate a container. An intermediate container is created so that
 the new container has the same name, while still supporting
 `volumes-from` the original container.
 """Recreate a container.

 The original container is renamed to a temporary name so that data
 volumes can be copied to the new container, before the original
 container is removed.
 """
 log.info("Recreating %s..." % container.name)
 try:
 container.stop()
 except APIError as e:
Expand All@@ -238,29 +242,17 @@ def recreate_container(self, container, **override_options):
 else:
 raise

 intermediate_container = Container.create(
 self.client,
 image=container.image,
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 # Use a hopefully unique container name by prepending the short id
 self.client.rename(
 container.id,
 '%s_%s' % (container.short_id, container.name))
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 previous_container=container,
 **override_options)
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)
 container.remove()
 return new_container

 def start_container_if_stopped(self, container):
 if container.is_running:
Expand DownExpand Up@@ -333,7 +325,7 @@ def _get_links(self, link_to_self):
 links.append((external_link, link_name))
 return links

 def _get_volumes_from(self, intermediate_container=None):
 def _get_volumes_from(self, previous_container=None):
 volumes_from = []
 for volume_source in self.volumes_from:
 if isinstance(volume_source, Service):
Expand All@@ -346,8 +338,8 @@ def _get_volumes_from(self, intermediate_container=None):
 elif isinstance(volume_source, Container):
 volumes_from.append(volume_source.id)

 if intermediate_container:
 volumes_from.append(intermediate_container.id)
 if previous_container:
 volumes_from.append(previous_container.id)

 return volumes_from

Expand All@@ -370,7 +362,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 def _get_container_create_options(self, override_options, one_off=False):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -415,11 +407,13 @@ def _get_container_create_options(self, override_options, one_off=False, interme
 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)
 container_options['host_config'] = self._get_container_host_config(
 override_options,
 one_off=one_off)

 return container_options

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

Expand DownExpand Up@@ -451,7 +445,7 @@ def _get_container_host_config(self, override_options, one_off=False, intermedia
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 volumes_from=options.get('volumes_from'),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
Expand Down

11 changes: 3 additions & 8 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -249,25 +249,20 @@ def test_recreate_containers(self):
 num_containers_before = len(self.client.containers(all=True))

 service.options['environment']['FOO'] = '2'
 tuples = service.recreate_containers()
 self.assertEqual(len(tuples), 1)

 intermediate_container = tuples[0][0]
 new_container = tuples[0][1]
 self.assertEqual(intermediate_container.dictionary['Config']['Entrypoint'], ['/bin/echo'])
 new_container, = service.recreate_containers()

 self.assertEqual(new_container.dictionary['Config']['Entrypoint'], ['sleep'])
 self.assertEqual(new_container.dictionary['Config']['Cmd'], ['300'])
 self.assertIn('FOO=2', new_container.dictionary['Config']['Env'])
 self.assertEqual(new_container.name, 'composetest_db_1')
 self.assertEqual(new_container.inspect()['Volumes']['/etc'], volume_path)
 self.assertIn(intermediate_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])
 self.assertIn(old_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])

 self.assertEqual(len(self.client.containers(all=True)), num_containers_before)
 self.assertNotEqual(old_container.id, new_container.id)
 self.assertRaises(APIError,
 self.client.inspect_container,
intermediate_container.id)
old_container.id)

 def test_recreate_containers_when_containers_are_stopped(self):
 service = self.create_service(
Expand Down

16 changes: 15 additions & 1 deletion
tests/unit/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ def test_get_volumes_from_container(self):

 self.assertEqual(service._get_volumes_from(), [container_id])

 def test_get_volumes_from_intermediate_container(self):
 def test_get_volumes_from_previous_container(self):
 container_id = 'aabbccddee'
 service = Service('test', image='foo')
 container = mock.Mock(id=container_id, spec=Container, image='foo')
Expand DownExpand Up@@ -263,6 +263,20 @@ def test_create_container_from_insecure_registry(
 mock_log.info.assert_called_once_with(
 'Pulling foo (someimage:sometag)...')

 @mock.patch('compose.service.Container', autospec=True)
 def test_recreate_container(self, _):
 mock_container = mock.create_autospec(Container)
 service = Service('foo', client=self.mock_client, image='someimage')
 new_container = service.recreate_container(mock_container)

 mock_container.stop.assert_called_once_with()
 self.mock_client.rename.assert_called_once_with(
 mock_container.id,
 '%s_%s' % (mock_container.short_id, mock_container.name))

 new_container.start.assert_called_once_with()
 mock_container.remove.assert_called_once_with()

 def test_parse_repository_tag(self):
 self.assertEqual(parse_repository_tag("root"), ("root", ""))
 self.assertEqual(parse_repository_tag("root:tag"), ("root", "tag"))
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
Rename container when recreating it#1349

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

May 8, 2015
 Merged


Rename container when recreating it
#1349
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


18 changes: 8 additions & 10 deletions
compose/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,17 +202,15 @@ def up(self,
 running_containers = []
 for service in self.get_services(service_names, include_deps=start_deps):
 if recreate:
 for (_, container) in service.recreate_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.recreate_containers
 else:
 for container in service.start_or_create_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.start_or_create_containers

 for container in create_func(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)

 return running_containers

Expand Down

74 changes: 34 additions & 40 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
 'pid',
 'privileged',
 'restart',
 'volumes_from',
]

VALID_NAME_CHARS = '[a-zA-Z0-9]'
Expand DownExpand Up@@ -175,16 +176,16 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
intermediate_container=None,
previous_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 override_options['volumes_from'] = self._get_volumes_from(previous_container)
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
Expand DownExpand Up@@ -213,21 +214,24 @@ def recreate_containers(self, insecure_registry=False, do_build=True, **override
 do_build=do_build,
 **override_options)
 self.start_container(container)
 return [(None, container)]
 else:
 tuples = []

 for c in containers:
 log.info("Recreating %s..." % c.name)
 tuples.append(self.recreate_container(c, insecure_registry=insecure_registry, **override_options))
 return [container]

 return tuples
 return [
 self.recreate_container(
 c,
 insecure_registry=insecure_registry,
 **override_options)
 for c in containers
 ]

 def recreate_container(self, container, **override_options):
 """Recreate a container. An intermediate container is created so that
 the new container has the same name, while still supporting
 `volumes-from` the original container.
 """Recreate a container.

 The original container is renamed to a temporary name so that data
 volumes can be copied to the new container, before the original
 container is removed.
 """
 log.info("Recreating %s..." % container.name)
 try:
 container.stop()
 except APIError as e:
Expand All@@ -238,29 +242,17 @@ def recreate_container(self, container, **override_options):
 else:
 raise

 intermediate_container = Container.create(
 self.client,
 image=container.image,
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 # Use a hopefully unique container name by prepending the short id
 self.client.rename(
 container.id,
 '%s_%s' % (container.short_id, container.name))
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 previous_container=container,
 **override_options)
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)
 container.remove()
 return new_container

 def start_container_if_stopped(self, container):
 if container.is_running:
Expand DownExpand Up@@ -333,7 +325,7 @@ def _get_links(self, link_to_self):
 links.append((external_link, link_name))
 return links

 def _get_volumes_from(self, intermediate_container=None):
 def _get_volumes_from(self, previous_container=None):
 volumes_from = []
 for volume_source in self.volumes_from:
 if isinstance(volume_source, Service):
Expand All@@ -346,8 +338,8 @@ def _get_volumes_from(self, intermediate_container=None):
 elif isinstance(volume_source, Container):
 volumes_from.append(volume_source.id)

 if intermediate_container:
 volumes_from.append(intermediate_container.id)
 if previous_container:
 volumes_from.append(previous_container.id)

 return volumes_from

Expand All@@ -370,7 +362,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 def _get_container_create_options(self, override_options, one_off=False):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -415,11 +407,13 @@ def _get_container_create_options(self, override_options, one_off=False, interme
 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)
 container_options['host_config'] = self._get_container_host_config(
 override_options,
 one_off=one_off)

 return container_options

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

Expand DownExpand Up@@ -451,7 +445,7 @@ def _get_container_host_config(self, override_options, one_off=False, intermedia
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 volumes_from=options.get('volumes_from'),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
Expand Down

11 changes: 3 additions & 8 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -249,25 +249,20 @@ def test_recreate_containers(self):
 num_containers_before = len(self.client.containers(all=True))

 service.options['environment']['FOO'] = '2'
 tuples = service.recreate_containers()
 self.assertEqual(len(tuples), 1)

 intermediate_container = tuples[0][0]
 new_container = tuples[0][1]
 self.assertEqual(intermediate_container.dictionary['Config']['Entrypoint'], ['/bin/echo'])
 new_container, = service.recreate_containers()

 self.assertEqual(new_container.dictionary['Config']['Entrypoint'], ['sleep'])
 self.assertEqual(new_container.dictionary['Config']['Cmd'], ['300'])
 self.assertIn('FOO=2', new_container.dictionary['Config']['Env'])
 self.assertEqual(new_container.name, 'composetest_db_1')
 self.assertEqual(new_container.inspect()['Volumes']['/etc'], volume_path)
 self.assertIn(intermediate_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])
 self.assertIn(old_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])

 self.assertEqual(len(self.client.containers(all=True)), num_containers_before)
 self.assertNotEqual(old_container.id, new_container.id)
 self.assertRaises(APIError,
 self.client.inspect_container,
intermediate_container.id)
old_container.id)

 def test_recreate_containers_when_containers_are_stopped(self):
 service = self.create_service(
Expand Down

16 changes: 15 additions & 1 deletion
tests/unit/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ def test_get_volumes_from_container(self):

 self.assertEqual(service._get_volumes_from(), [container_id])

 def test_get_volumes_from_intermediate_container(self):
 def test_get_volumes_from_previous_container(self):
 container_id = 'aabbccddee'
 service = Service('test', image='foo')
 container = mock.Mock(id=container_id, spec=Container, image='foo')
Expand DownExpand Up@@ -263,6 +263,20 @@ def test_create_container_from_insecure_registry(
 mock_log.info.assert_called_once_with(
 'Pulling foo (someimage:sometag)...')

 @mock.patch('compose.service.Container', autospec=True)
 def test_recreate_container(self, _):
 mock_container = mock.create_autospec(Container)
 service = Service('foo', client=self.mock_client, image='someimage')
 new_container = service.recreate_container(mock_container)

 mock_container.stop.assert_called_once_with()
 self.mock_client.rename.assert_called_once_with(
 mock_container.id,
 '%s_%s' % (mock_container.short_id, mock_container.name))

 new_container.start.assert_called_once_with()
 mock_container.remove.assert_called_once_with()

 def test_parse_repository_tag(self):
 self.assertEqual(parse_repository_tag("root"), ("root", ""))
 self.assertEqual(parse_repository_tag("root:tag"), ("root", "tag"))
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
Rename container when recreating it#1349

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

May 8, 2015
 Merged


Rename container when recreating it
#1349
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


18 changes: 8 additions & 10 deletions
compose/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -202,17 +202,15 @@ def up(self,
 running_containers = []
 for service in self.get_services(service_names, include_deps=start_deps):
 if recreate:
 for (_, container) in service.recreate_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.recreate_containers
 else:
 for container in service.start_or_create_containers(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)
 create_func = service.start_or_create_containers

 for container in create_func(
 insecure_registry=insecure_registry,
 detach=detach,
 do_build=do_build):
 running_containers.append(container)

 return running_containers

Expand Down

74 changes: 34 additions & 40 deletions
compose/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
 'pid',
 'privileged',
 'restart',
 'volumes_from',
]

VALID_NAME_CHARS = '[a-zA-Z0-9]'
Expand DownExpand Up@@ -175,16 +176,16 @@ def create_container(self,
 one_off=False,
 insecure_registry=False,
 do_build=True,
intermediate_container=None,
previous_container=None,
 **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
 """
 override_options['volumes_from'] = self._get_volumes_from(previous_container)
 container_options = self._get_container_create_options(
 override_options,
 one_off=one_off,
 intermediate_container=intermediate_container,
 )

 if (do_build and
Expand DownExpand Up@@ -213,21 +214,24 @@ def recreate_containers(self, insecure_registry=False, do_build=True, **override
 do_build=do_build,
 **override_options)
 self.start_container(container)
 return [(None, container)]
 else:
 tuples = []

 for c in containers:
 log.info("Recreating %s..." % c.name)
 tuples.append(self.recreate_container(c, insecure_registry=insecure_registry, **override_options))
 return [container]

 return tuples
 return [
 self.recreate_container(
 c,
 insecure_registry=insecure_registry,
 **override_options)
 for c in containers
 ]

 def recreate_container(self, container, **override_options):
 """Recreate a container. An intermediate container is created so that
 the new container has the same name, while still supporting
 `volumes-from` the original container.
 """Recreate a container.

 The original container is renamed to a temporary name so that data
 volumes can be copied to the new container, before the original
 container is removed.
 """
 log.info("Recreating %s..." % container.name)
 try:
 container.stop()
 except APIError as e:
Expand All@@ -238,29 +242,17 @@ def recreate_container(self, container, **override_options):
 else:
 raise

 intermediate_container = Container.create(
 self.client,
 image=container.image,
 entrypoint=['/bin/echo'],
 command=[],
 detach=True,
 host_config=create_host_config(volumes_from=[container.id]),
 )
 intermediate_container.start()
 intermediate_container.wait()
 container.remove()

 options = dict(override_options)
 # Use a hopefully unique container name by prepending the short id
 self.client.rename(
 container.id,
 '%s_%s' % (container.short_id, container.name))
 new_container = self.create_container(
 do_build=False,
 intermediate_container=intermediate_container,
 **options
 )
 previous_container=container,
 **override_options)
 self.start_container(new_container)

 intermediate_container.remove()

 return (intermediate_container, new_container)
 container.remove()
 return new_container

 def start_container_if_stopped(self, container):
 if container.is_running:
Expand DownExpand Up@@ -333,7 +325,7 @@ def _get_links(self, link_to_self):
 links.append((external_link, link_name))
 return links

 def _get_volumes_from(self, intermediate_container=None):
 def _get_volumes_from(self, previous_container=None):
 volumes_from = []
 for volume_source in self.volumes_from:
 if isinstance(volume_source, Service):
Expand All@@ -346,8 +338,8 @@ def _get_volumes_from(self, intermediate_container=None):
 elif isinstance(volume_source, Container):
 volumes_from.append(volume_source.id)

 if intermediate_container:
 volumes_from.append(intermediate_container.id)
 if previous_container:
 volumes_from.append(previous_container.id)

 return volumes_from

Expand All@@ -370,7 +362,7 @@ def _get_net(self):

 return net

 def _get_container_create_options(self, override_options, one_off=False, intermediate_container=None):
 def _get_container_create_options(self, override_options, one_off=False):
 container_options = dict(
 (k, self.options[k])
 for k in DOCKER_CONFIG_KEYS if k in self.options)
Expand DownExpand Up@@ -415,11 +407,13 @@ def _get_container_create_options(self, override_options, one_off=False, interme
 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)
 container_options['host_config'] = self._get_container_host_config(
 override_options,
 one_off=one_off)

 return container_options

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

Expand DownExpand Up@@ -451,7 +445,7 @@ def _get_container_host_config(self, override_options, one_off=False, intermedia
 links=self._get_links(link_to_self=one_off),
 port_bindings=port_bindings,
 binds=volume_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 volumes_from=options.get('volumes_from'),
 privileged=privileged,
 network_mode=self._get_net(),
 dns=dns,
Expand Down

11 changes: 3 additions & 8 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -249,25 +249,20 @@ def test_recreate_containers(self):
 num_containers_before = len(self.client.containers(all=True))

 service.options['environment']['FOO'] = '2'
 tuples = service.recreate_containers()
 self.assertEqual(len(tuples), 1)

 intermediate_container = tuples[0][0]
 new_container = tuples[0][1]
 self.assertEqual(intermediate_container.dictionary['Config']['Entrypoint'], ['/bin/echo'])
 new_container, = service.recreate_containers()

 self.assertEqual(new_container.dictionary['Config']['Entrypoint'], ['sleep'])
 self.assertEqual(new_container.dictionary['Config']['Cmd'], ['300'])
 self.assertIn('FOO=2', new_container.dictionary['Config']['Env'])
 self.assertEqual(new_container.name, 'composetest_db_1')
 self.assertEqual(new_container.inspect()['Volumes']['/etc'], volume_path)
 self.assertIn(intermediate_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])
 self.assertIn(old_container.id, new_container.dictionary['HostConfig']['VolumesFrom'])

 self.assertEqual(len(self.client.containers(all=True)), num_containers_before)
 self.assertNotEqual(old_container.id, new_container.id)
 self.assertRaises(APIError,
 self.client.inspect_container,
intermediate_container.id)
old_container.id)

 def test_recreate_containers_when_containers_are_stopped(self):
 service = self.create_service(
Expand Down

16 changes: 15 additions & 1 deletion
tests/unit/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ def test_get_volumes_from_container(self):

 self.assertEqual(service._get_volumes_from(), [container_id])

 def test_get_volumes_from_intermediate_container(self):
 def test_get_volumes_from_previous_container(self):
 container_id = 'aabbccddee'
 service = Service('test', image='foo')
 container = mock.Mock(id=container_id, spec=Container, image='foo')
Expand DownExpand Up@@ -263,6 +263,20 @@ def test_create_container_from_insecure_registry(
 mock_log.info.assert_called_once_with(
 'Pulling foo (someimage:sometag)...')

 @mock.patch('compose.service.Container', autospec=True)
 def test_recreate_container(self, _):
 mock_container = mock.create_autospec(Container)
 service = Service('foo', client=self.mock_client, image='someimage')
 new_container = service.recreate_container(mock_container)

 mock_container.stop.assert_called_once_with()
 self.mock_client.rename.assert_called_once_with(
 mock_container.id,
 '%s_%s' % (mock_container.short_id, mock_container.name))

 new_container.start.assert_called_once_with()
 mock_container.remove.assert_called_once_with()

 def test_parse_repository_tag(self):
 self.assertEqual(parse_repository_tag("root"), ("root", ""))
 self.assertEqual(parse_repository_tag("root:tag"), ("root", "tag"))
Expand Down