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

Merge pull request #490 from LuminosoInsight/insecure-pull

Browse source 
Allow pulls from an insecure registry
This commit is contained in:
Aanand Prasad 2014-10-01 10:52:54 -07:00
commit 431fdaa0f1
5 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fig/cli/main.py
View file

@ -213,9 +213,17 @@ class TopLevelCommand(Command):
"""
Pulls images for services.
Usage: pull [SERVICE...]
Usage: pull [options] [SERVICE...]
Options:
--allow-insecure-ssl Allow insecure connections to the docker
registry
"""
project.pull(service_names=options['SERVICE'])
insecure_registry = options['--allow-insecure-ssl']
project.pull(
service_names=options['SERVICE'],
insecure_registry=insecure_registry
)
def rm(self, project, options):
"""

4
fig/project.py
View file

@ -180,9 +180,9 @@ class Project(object):
return running_containers
def pull(self, service_names=None):
def pull(self, service_names=None, insecure_registry=False):
for service in self.get_services(service_names, include_links=True):
service.pull()
service.pull(insecure_registry=insecure_registry)
def remove_stopped(self, service_names=None, **options):
for service in self.get_services(service_names):

7
fig/service.py
View file

@ -423,10 +423,13 @@ class Service(object):
return False
return True
def pull(self):
def pull(self, insecure_registry=False):
if 'image' in self.options:
log.info('Pulling %s (%s)...' % (self.name, self.options.get('image')))
self.client.pull(self.options.get('image'))
self.client.pull(
self.options.get('image'),
insecure_registry=insecure_registry
)
NAME_RE = re.compile(r'^([^_]+)_([^_]+)_(run_)?(\d+)$')