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

Allow dependent image pull from insecure registry

Browse source 
PR #490 Provides the ability to pull from an insecure registry by passing --allow-insecure-ssl. This commit extends the work done in #490 and adds the ability to pass --allow-insecure-ssl to the up and run commands which will attempt to pull dependent images if they do not exist.

Signed-off-by: Tyler Rivera <riverat2@email.chop.edu>
This commit is contained in:
Tyler Rivera 2014-10-22 10:57:43 -04:00
commit 491181ec31
4 changed files with 54 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fig/service.py
View file

@ -168,7 +168,7 @@ class Service(object):
log.info("Removing %s..." % c.name)
c.remove(**options)
def create_container(self, one_off=False, **override_options):
def create_container(self, one_off=False, insecure_registry=False, **override_options):
"""
Create a container for this service. If the image doesn't exist, attempt to pull
it.
@ -179,7 +179,11 @@ class Service(object):
except APIError as e:
if e.response.status_code == 404 and e.explanation and 'No such image' in str(e.explanation):
log.info('Pulling image %s...' % container_options['image'])
output = self.client.pull(container_options['image'], stream=True)
output = self.client.pull(
container_options['image'],
stream=True,
insecure_registry=insecure_registry
)
stream_output(output, sys.stdout)
return Container.create(self.client, **container_options)
raise
@ -270,12 +274,12 @@ class Service(object):
)
return container
def start_or_create_containers(self):
def start_or_create_containers(self, insecure_registry=False):
containers = self.containers(stopped=True)
if not containers:
log.info("Creating %s..." % self._next_container_name(containers))
new_container = self.create_container()
new_container = self.create_container(insecure_registry=insecure_registry)
return [self.start_container(new_container)]
else:
return [self.start_container_if_stopped(c) for c in containers]