tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 08:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement --scale option on up command, allow scale config in v2.2 format

Browse Source 
docker-compose scale modified to reuse code between up and scale

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-04-17 19:03:56 -07:00 committed by Joffrey F
parent ade23b585e
commit ec5d8264c9
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compose/service.py
View File

@ -392,7 +392,7 @@ class Service(object):
range(i, i + scale), range(i, i + scale),
lambda n: create_and_start(self, n), lambda n: create_and_start(self, n),
lambda n: self.get_container_name(n), lambda n: self.get_container_name(n),
"Creating" "Creating",
) )
for error in errors.values(): for error in errors.values():
raise OperationFailedError(error) raise OperationFailedError(error)
@ -413,7 +413,7 @@ class Service(object):
containers, containers,
recreate, recreate,
lambda c: c.name, lambda c: c.name,
"Recreating" "Recreating",
) )
for error in errors.values(): for error in errors.values():
raise OperationFailedError(error) raise OperationFailedError(error)
@ -433,7 +433,7 @@ class Service(object):
containers, containers,
lambda c: self.start_container_if_stopped(c, attach_logs=not detached), lambda c: self.start_container_if_stopped(c, attach_logs=not detached),
lambda c: c.name, lambda c: c.name,
"Starting" "Starting",
) )
for error in errors.values(): for error in errors.values():
@ -868,7 +868,7 @@ class Service(object):
volume_driver=options.get('volume_driver'), volume_driver=options.get('volume_driver'),
cpuset_cpus=options.get('cpuset'), cpuset_cpus=options.get('cpuset'),
cpu_shares=options.get('cpu_shares'), cpu_shares=options.get('cpu_shares'),
storage_opt=options.get('storage_opt') storage_opt=options.get('storage_opt'),
) )
def get_secret_volumes(self): def get_secret_volumes(self):
@ -905,9 +905,7 @@ class Service(object):
nocache=no_cache, nocache=no_cache,
dockerfile=build_opts.get('dockerfile', None), dockerfile=build_opts.get('dockerfile', None),
cache_from=build_opts.get('cache_from', None), cache_from=build_opts.get('cache_from', None),
labels=build_opts.get('labels', None), buildargs=build_args
buildargs=build_args,
network_mode=build_opts.get('network', None),
) )
try: try: