tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1526 from aanand/remove-start-or-create-containers

Browse Source 
Remove Service.start_or_create_containers()
This commit is contained in:
Daniel Nephin 2015-06-08 12:49:32 -04:00
commit 38a11c4c28
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compose/service.py
View File

@ -394,21 +394,6 @@ class Service(object):
container.start() container.start()
return container return container
def start_or_create_containers(
self,
insecure_registry=False,
do_build=True):
containers = self.containers(stopped=True)
if not containers:
new_container = self.create_container(
insecure_registry=insecure_registry,
do_build=do_build,
)
return [self.start_container(new_container)]
else:
return [self.start_container_if_stopped(c) for c in containers]
def config_hash(self): def config_hash(self):
return json_hash(self.config_dict()) return json_hash(self.config_dict())

4
tests/integration/service_test.py
View File

@ -501,10 +501,10 @@ class ServiceTest(DockerClientTestCase):
], ],
}) })
def test_start_with_image_id(self): def test_create_with_image_id(self):
# Image id for the current busybox:latest # Image id for the current busybox:latest
service = self.create_service('foo', image='8c2e06607696') service = self.create_service('foo', image='8c2e06607696')
self.assertTrue(service.start_or_create_containers()) service.create_container()
def test_scale(self): def test_scale(self):
service = self.create_service('web') service = self.create_service('web')