afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed service load methids, since they are no longer used, added way for custom service load code to facilitate the unique docker service case

Browse source
This commit is contained in:
Blake J. Harnden 2017-08-07 16:40:39 -07:00
parent 73eea80f51
commit f3863ead73
11 changed files with 26 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

40
daemon/core/services/dockersvc.py
View file

@ -153,27 +153,25 @@ done
""" % (cls._image,)
return cfg
@classmethod
def on_load(cls):
logger.debug("loading custom docker services")
def load_services():
ServiceManager.add(DockerService)
if "Client" in globals():
client = Client(version="1.10")
images = client.images()
del client
else:
images = []
# This auto-loads Docker images having a :core tag, adding them to the list
# of services under the "Docker" group.
# TODO: change this logic, should be a proper configurable, or docker needs to be a required library
# TODO: also should make this call possible real time for reloading removing "magic" auto loading on import
if 'Client' in globals():
client = Client(version='1.10')
images = client.images()
del client
else:
images = []
for image in images:
if u'<none>' in image['RepoTags'][0]:
continue
for repo in image['RepoTags']:
if u':core' not in repo:
for image in images:
if u"<none>" in image["RepoTags"][0]:
continue
dockerid = repo.encode('ascii', 'ignore').split(':')[0]
sub_class = type('SubClass', (DockerService,), {'_name': dockerid, '_image': dockerid})
ServiceManager.add(sub_class)
del images
for repo in image["RepoTags"]:
if u":core" not in repo:
continue
dockerid = repo.encode("ascii", "ignore").split(":")[0]
sub_class = type("SubClass", (DockerService,), {"_name": dockerid, "_image": dockerid})
ServiceManager.add(sub_class)
del images