jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove auto_start option from fig.yml.

Browse source 
This option is redundant now that services can be started along with links.

Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
This commit is contained in:
Chris Corbyn 2014-06-21 10:39:36 +00:00
commit 247691ca44
7 changed files with 11 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fig/project.py
View file

@ -92,8 +92,8 @@ class Project(object):
def get_services(self, service_names=None, include_links=False):
"""
Returns a list of this project's services filtered
by the provided list of names, or all auto_start services if
service_names is None or [].
by the provided list of names, or all services if service_names is None
or [].
If include_links is specified, returns a list including the links for
service_names, in order of dependency.
@ -105,7 +105,7 @@ class Project(object):
"""
if service_names is None or len(service_names) == 0:
return self.get_services(
service_names=[s.name for s in self.services if s.options['auto_start']],
service_names=[s.name for s in self.services],
include_links=include_links
)
else:

5
fig/service.py
View file

@ -45,10 +45,7 @@ class Service(object):
if 'image' in options and 'build' in options:
raise ConfigError('Service %s has both an image and build path specified. A service can either be built to image or use an existing image, not both.' % name)
if 'auto_start' not in options:
options['auto_start'] = True
supported_options = DOCKER_CONFIG_KEYS + ['auto_start', 'build', 'expose']
supported_options = DOCKER_CONFIG_KEYS + ['build', 'expose']
for k in options:
if k not in supported_options: