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

Remove rebuild parameter ; set do_build instead 

Reduce repetition in main.py

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-01-11 16:37:09 -08:00
parent 7591639c72
commit 2d986dff79
4 changed files with 33 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compose/cli/main.py
View File

@ -977,12 +977,12 @@ class TopLevelCommand(object):
raise UserError('--no-start and {} cannot be combined.'.format(excluded)) raise UserError('--no-start and {} cannot be combined.'.format(excluded))
with up_shutdown_context(self.project, service_names, timeout, detached): with up_shutdown_context(self.project, service_names, timeout, detached):
try: def up(rebuild):
to_attach = self.project.up( return self.project.up(
service_names=service_names, service_names=service_names,
start_deps=start_deps, start_deps=start_deps,
strategy=convergence_strategy_from_opts(options), strategy=convergence_strategy_from_opts(options),
do_build=build_action_from_opts(options), do_build=build_action_from_opts(options) if not rebuild else BuildAction.force,
timeout=timeout, timeout=timeout,
detached=detached, detached=detached,
remove_orphans=remove_orphans, remove_orphans=remove_orphans,
@ -990,8 +990,10 @@ class TopLevelCommand(object):
scale_override=parse_scale_args(options['--scale']), scale_override=parse_scale_args(options['--scale']),
start=not no_start, start=not no_start,
always_recreate_deps=always_recreate_deps, always_recreate_deps=always_recreate_deps,
rebuild=False
) )
try:
to_attach = up(False)
except docker.errors.ImageNotFound as e: except docker.errors.ImageNotFound as e:
log.error(("Image not found. If you continue, there is a " log.error(("Image not found. If you continue, there is a "
"risk of data loss. Consider backing up your data " "risk of data loss. Consider backing up your data "
@ -1002,20 +1004,7 @@ class TopLevelCommand(object):
if res is None or not res: if res is None or not res:
raise e raise e
to_attach = self.project.up( to_attach = up(True)
service_names=service_names,
start_deps=start_deps,
strategy=convergence_strategy_from_opts(options),
do_build=build_action_from_opts(options),
timeout=timeout,
detached=detached,
remove_orphans=remove_orphans,
ignore_orphans=ignore_orphans,
scale_override=parse_scale_args(options['--scale']),
start=not no_start,
always_recreate_deps=always_recreate_deps,
rebuild=True
)
if detached or no_start: if detached or no_start:
return return

2
compose/project.py
View File

@ -442,7 +442,6 @@ class Project(object):
remove_orphans=False, remove_orphans=False,
ignore_orphans=False, ignore_orphans=False,
scale_override=None, scale_override=None,
rebuild=False,
rescale=True, rescale=True,
start=True, start=True,
always_recreate_deps=False): always_recreate_deps=False):
@ -473,7 +472,6 @@ class Project(object):
timeout=timeout, timeout=timeout,
detached=detached, detached=detached,
scale_override=scale_override.get(service.name), scale_override=scale_override.get(service.name),
rebuild=rebuild,
rescale=rescale, rescale=rescale,
start=start, start=start,
project_services=scaled_services project_services=scaled_services

44
compose/service.py
View File

@ -280,7 +280,6 @@ class Service(object):
previous_container=None, previous_container=None,
number=None, number=None,
quiet=False, quiet=False,
rebuild=False,
**override_options): **override_options):
""" """
Create a container for this service. If the image doesn't exist, attempt to pull Create a container for this service. If the image doesn't exist, attempt to pull
@ -294,7 +293,6 @@ class Service(object):
override_options, override_options,
number or self._next_container_number(one_off=one_off), number or self._next_container_number(one_off=one_off),
one_off=one_off, one_off=one_off,
rebuild=rebuild,
previous_container=previous_container, previous_container=previous_container,
) )
@ -411,7 +409,7 @@ class Service(object):
return containers return containers
def _execute_convergence_recreate(self, containers, scale, timeout, detached, start, rebuild): def _execute_convergence_recreate(self, containers, scale, timeout, detached, start):
if scale is not None and len(containers) > scale: if scale is not None and len(containers) > scale:
self._downscale(containers[scale:], timeout) self._downscale(containers[scale:], timeout)
containers = containers[:scale] containers = containers[:scale]
@ -419,7 +417,7 @@ class Service(object):
def recreate(container): def recreate(container):
return self.recreate_container( return self.recreate_container(
container, timeout=timeout, attach_logs=not detached, container, timeout=timeout, attach_logs=not detached,
start_new_container=start, rebuild=rebuild start_new_container=start
) )
containers, errors = parallel_execute( containers, errors = parallel_execute(
containers, containers,
@ -470,7 +468,7 @@ class Service(object):
) )
def execute_convergence_plan(self, plan, timeout=None, detached=False, def execute_convergence_plan(self, plan, timeout=None, detached=False,
start=True, scale_override=None, rebuild=False, start=True, scale_override=None,
rescale=True, project_services=None): rescale=True, project_services=None):
(action, containers) = plan (action, containers) = plan
scale = scale_override if scale_override is not None else self.scale_num scale = scale_override if scale_override is not None else self.scale_num
@ -490,7 +488,7 @@ class Service(object):
if action == 'recreate': if action == 'recreate':
return self._execute_convergence_recreate( return self._execute_convergence_recreate(
containers, scale, timeout, detached, start, rebuild containers, scale, timeout, detached, start
) )
if action == 'start': if action == 'start':
@ -510,13 +508,7 @@ class Service(object):
raise Exception("Invalid action: {}".format(action)) raise Exception("Invalid action: {}".format(action))
def recreate_container( def recreate_container(self, container, timeout=None, attach_logs=False, start_new_container=True):
self,
container,
timeout=None,
attach_logs=False,
rebuild=False,
start_new_container=True):
"""Recreate a container. """Recreate a container.
The original container is renamed to a temporary name so that data The original container is renamed to a temporary name so that data
@ -530,7 +522,6 @@ class Service(object):
previous_container=container, previous_container=container,
number=container.labels.get(LABEL_CONTAINER_NUMBER), number=container.labels.get(LABEL_CONTAINER_NUMBER),
quiet=True, quiet=True,
rebuild=rebuild
) )
if attach_logs: if attach_logs:
new_container.attach_log_stream() new_container.attach_log_stream()
@ -751,7 +742,6 @@ class Service(object):
override_options, override_options,
number, number,
one_off=False, one_off=False,
rebuild=False,
previous_container=None): previous_container=None):
add_config_hash = (not one_off and not override_options) add_config_hash = (not one_off and not override_options)
@ -801,7 +791,7 @@ class Service(object):
override_options.get('labels')) override_options.get('labels'))
container_options, override_options = self._build_container_volume_options( container_options, override_options = self._build_container_volume_options(
previous_container, container_options, override_options, rebuild previous_container, container_options, override_options
) )
container_options['image'] = self.image_name container_options['image'] = self.image_name
@ -828,8 +818,7 @@ class Service(object):
container_options['environment']) container_options['environment'])
return container_options return container_options
def _build_container_volume_options(self, previous_container, container_options, def _build_container_volume_options(self, previous_container, container_options, override_options):
override_options, rebuild):
container_volumes = [] container_volumes = []
container_mounts = [] container_mounts = []
if 'volumes' in container_options: if 'volumes' in container_options:
@ -840,7 +829,7 @@ class Service(object):
binds, affinity = merge_volume_bindings( binds, affinity = merge_volume_bindings(
container_volumes, self.options.get('tmpfs') or [], previous_container, container_volumes, self.options.get('tmpfs') or [], previous_container,
container_mounts, rebuild container_mounts
) )
override_options['binds'] = binds override_options['binds'] = binds
container_options['environment'].update(affinity) container_options['environment'].update(affinity)
@ -1288,7 +1277,7 @@ def parse_repository_tag(repo_path):
# Volumes # Volumes
def merge_volume_bindings(volumes, tmpfs, previous_container, mounts, rebuild): def merge_volume_bindings(volumes, tmpfs, previous_container, mounts):
""" """
Return a list of volume bindings for a container. Container data volumes Return a list of volume bindings for a container. Container data volumes
are replaced by those from the previous container. are replaced by those from the previous container.
@ -1304,7 +1293,7 @@ def merge_volume_bindings(volumes, tmpfs, previous_container, mounts, rebuild):
if previous_container: if previous_container:
old_volumes, old_mounts = get_container_data_volumes( old_volumes, old_mounts = get_container_data_volumes(
previous_container, volumes, tmpfs, mounts, rebuild previous_container, volumes, tmpfs, mounts
) )
warn_on_masked_volume(volumes, old_volumes, previous_container.service) warn_on_masked_volume(volumes, old_volumes, previous_container.service)
volume_bindings.update( volume_bindings.update(
@ -1317,11 +1306,11 @@ def merge_volume_bindings(volumes, tmpfs, previous_container, mounts, rebuild):
return list(volume_bindings.values()), affinity return list(volume_bindings.values()), affinity
def try_get_image_volumes(container, rebuild): def try_get_image_volumes(container):
""" """
Try to get the volumes from the existing container. If the image does Try to get the volumes from the existing container. If the image does
not exist, prompt the user to either continue (rebuild the image from not exist, raise an exception that will be caught at the CLI level to
scratch) or raise an exception. prompt user for a rebuild.
""" """
try: try:
@ -1332,13 +1321,10 @@ def try_get_image_volumes(container, rebuild):
] ]
return image_volumes return image_volumes
except ImageNotFound: except ImageNotFound:
if rebuild:
# This will force Compose to rebuild the images.
return []
raise raise
def get_container_data_volumes(container, volumes_option, tmpfs_option, mounts_option, rebuild): def get_container_data_volumes(container, volumes_option, tmpfs_option, mounts_option):
""" """
Find the container data volumes that are in `volumes_option`, and return Find the container data volumes that are in `volumes_option`, and return
a mapping of volume bindings for those volumes. a mapping of volume bindings for those volumes.
@ -1353,7 +1339,7 @@ def get_container_data_volumes(container, volumes_option, tmpfs_option, mounts_o
for mount in container.get('Mounts') or {} for mount in container.get('Mounts') or {}
) )
image_volumes = try_get_image_volumes(container, rebuild) image_volumes = try_get_image_volumes(container)
for volume in set(volumes_option + image_volumes): for volume in set(volumes_option + image_volumes):
# No need to preserve host volumes # No need to preserve host volumes

14
tests/unit/service_test.py
View File

@ -923,10 +923,18 @@ class ServiceVolumesTest(unittest.TestCase):
VolumeSpec.parse('imagedata:/mnt/image/data:rw'), VolumeSpec.parse('imagedata:/mnt/image/data:rw'),
] ]
volumes, _ = get_container_data_volumes(container, options, ['/dev/tmpfs'], [], False) volumes, _ = get_container_data_volumes(container, options, ['/dev/tmpfs'], [])
assert sorted(volumes) == sorted(expected) assert sorted(volumes) == sorted(expected)
def test_get_container_data_volumes_image_is_none(self):
# Issue 5465, check for non-existant image. # Issue 5465, check for non-existant image.
options = [VolumeSpec.parse(v) for v in [
'/host/volume:/host/volume:ro',
'/new/volume',
'/existing/volume',
'named:/named/vol',
'/dev/tmpfs'
]]
container = Container(self.mock_client, { container = Container(self.mock_client, {
'Image': None, 'Image': None,
@ -935,7 +943,7 @@ class ServiceVolumesTest(unittest.TestCase):
expected = [] expected = []
volumes, _ = get_container_data_volumes(container, options, ['/dev/tmpfs'], [], False) volumes, _ = get_container_data_volumes(container, options, ['/dev/tmpfs'], [])
assert sorted(volumes) == sorted(expected) assert sorted(volumes) == sorted(expected)
def test_merge_volume_bindings(self): def test_merge_volume_bindings(self):
@ -971,7 +979,7 @@ class ServiceVolumesTest(unittest.TestCase):
'existingvolume:/existing/volume:rw', 'existingvolume:/existing/volume:rw',
] ]
binds, affinity = merge_volume_bindings(options, ['/dev/tmpfs'], previous_container, [], False) binds, affinity = merge_volume_bindings(options, ['/dev/tmpfs'], previous_container, [])
assert sorted(binds) == sorted(expected) assert sorted(binds) == sorted(expected)
assert affinity == {'affinity:container': '=cdefab'} assert affinity == {'affinity:container': '=cdefab'}