Merge pull request #137 from hydroshare/develop

Added support for running images with tags
hydroshare · Oct 5, 2018 · d5d3d91 · d5d3d91
2 parents 9346d1f + 636cb88
commit d5d3d91
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build/specs/specworker/jobs.py b/build/specs/specworker/jobs.py
@@ -31,7 +31,7 @@ def is_registered(image_name):
     image_list = job.result
     if image_name in image_list:
         return True
-    return Fals
+    return False
 
 def describe(image_name):
 

diff --git a/build/specs/specworker/tasks.py b/build/specs/specworker/tasks.py
@@ -21,10 +21,10 @@ def task_sanity_check(string, wait=1):
 def task_get_registered_images():
 
     try:
-        registered_images = os.environ['IMAGES'].split(':')
+        registered_images = os.environ['IMAGES'].split(';')
         res = os.popen("docker images").read()
         res = res.split('\n')
-        imgs = [res[i].split()[0] for i in range(1,len(res)-1) if res[i].split()[0] in registered_images]
+        imgs = [':'.join(res[i].split()[0:2]) for i in range(1,len(res)-1) if ':'.join(res[i].split()[0:2]) in registered_images]
     except Excpetion as e:
         print('Exception occurred when retrieving image list: %s' % e)
         return []