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

Merge pull request #763 from bfirsh/pass-through-detach-to-create-container

Browse source 
Don't attach stdin and stdout when in detach mode
This commit is contained in:
Aanand Prasad 2014-12-30 16:05:53 +00:00
commit 70c3676084
5 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fig/service.py
View file

@ -158,7 +158,7 @@ class Service(object):
# Create enough containers
containers = self.containers(stopped=True)
while len(containers) < desired_num:
containers.append(self.create_container())
containers.append(self.create_container(detach=True))
running_containers = []
stopped_containers = []
@ -252,6 +252,7 @@ class Service(object):
image=container.image,
entrypoint=['/bin/echo'],
command=[],
detach=True,
)
intermediate_container.start(volumes_from=container.id)
intermediate_container.wait()
@ -306,12 +307,15 @@ class Service(object):
)
return container
def start_or_create_containers(self, insecure_registry=False):
def start_or_create_containers(self, insecure_registry=False, detach=False):
containers = self.containers(stopped=True)
if not containers:
log.info("Creating %s..." % self._next_container_name(containers))
new_container = self.create_container(insecure_registry=insecure_registry)
new_container = self.create_container(
insecure_registry=insecure_registry,
detach=detach
)
return [self.start_container(new_container)]
else:
return [self.start_container_if_stopped(c) for c in containers]