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

Rename --keep-old to --no-recreate

Browse source 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
This commit is contained in:
d11wtq 2014-06-08 23:20:51 +00:00 • committed by Chris Corbyn
commit 1d1e23611b
5 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
fig/cli/main.py
View file

@ -223,7 +223,7 @@ class TopLevelCommand(Command):
self.project.up(
service_names=service.get_linked_names(),
start_links=True,
keep_old=True
recreate=False
)
tty = True
@ -303,27 +303,27 @@ class TopLevelCommand(Command):
If there are existing containers for a service, `fig up` will stop
and recreate them (preserving mounted volumes with volumes-from),
so that changes in `fig.yml` are picked up. If you do not want existing
containers to be recreated, `fig up --keep-old` will re-use existing
containers to be recreated, `fig up --no-recreate` will re-use existing
containers.
Usage: up [options] [SERVICE...]
Options:
-d Detached mode: Run containers in the background, print
new container names.
--no-links Don't start linked services.
--keep-old If containers already exist, don't recreate them.
-d Detached mode: Run containers in the background,
print new container names.
--no-links Don't start linked services.
--no-recreate If containers already exist, don't recreate them.
"""
detached = options['-d']
start_links = not options['--no-links']
keep_old = options['--keep-old']
recreate = not options['--no-recreate']
service_names = options['SERVICE']
to_attach = self.project.up(
service_names=service_names,
start_links=start_links,
keep_old=keep_old
recreate=recreate
)
if not detached:

8
fig/project.py
View file

@ -138,15 +138,15 @@ class Project(object):
else:
log.info('%s uses an image, skipping' % service.name)
def up(self, service_names=None, start_links=True, keep_old=False):
def up(self, service_names=None, start_links=True, recreate=True):
running_containers = []
for service in self.get_services(service_names, include_links=start_links):
if keep_old:
for container in service.start_or_create_containers():
if recreate:
for (_, container) in service.recreate_containers():
running_containers.append(container)
else:
for (_, container) in service.recreate_containers():
for container in service.start_or_create_containers():
running_containers.append(container)
return running_containers