Merge pull request #489 from common-workflow-language/fallback_no_find_default_container

deal with missing find_default_container function better

Author: mr-c

cwltool/draft2tool.py

@@ -181,7 +181,8 @@ def __init__(self, toolpath_object, **kwargs):
     def makeJobRunner(self, use_container=True):  # type: (Optional[bool]) -> JobBase
         dockerReq, _ = self.get_requirement("DockerRequirement")
         if not dockerReq and use_container:
-            default_container = self.find_default_container(self)
+            if self.find_default_container:
+                default_container = self.find_default_container(self)
             if default_container:
                 self.requirements.insert(0, {
                     "class": "DockerRequirement",
@@ -228,9 +229,9 @@ def job(self,
 
             cmdline = flatten(list(map(cachebuilder.generate_arg, cachebuilder.bindings)))
             (docker_req, docker_is_req) = self.get_requirement("DockerRequirement")
-            if docker_req and kwargs.get("use_container") is not False:
+            if docker_req and kwargs.get("use_container"):
                 dockerimg = docker_req.get("dockerImageId") or docker_req.get("dockerPull")
-            elif kwargs.get("default_container", None) is not None and kwargs.get("use_container") is not False:
+            elif kwargs.get("default_container", None) is not None and kwargs.get("use_container"):
                 dockerimg = kwargs.get("default_container")
 
             if dockerimg:
@@ -268,7 +269,7 @@ def job(self,
             jobcachepending = jobcache + ".pending"
 
             if os.path.isdir(jobcache) and not os.path.isfile(jobcachepending):
-                if docker_req and kwargs.get("use_container") is not False:
+                if docker_req and kwargs.get("use_container"):
                     cachebuilder.outdir = kwargs.get("docker_outdir") or "/var/spool/cwl"
                 else:
                     cachebuilder.outdir = jobcache

cwltool/job.py

@@ -347,14 +347,14 @@ def run(self, pull_image=True, rm_container=True,
         env = None  # type: MutableMapping[Text, Text]
         try:
             env = cast(MutableMapping[Text, Text], os.environ)
-            if docker_req and kwargs.get("use_container") is not False:
+            if docker_req and kwargs.get("use_container"):
                 img_id = docker.get_from_requirements(docker_req, True, pull_image)
             if img_id is None:
-                find_default_container = self.builder.find_default_container
-                default_container = find_default_container and find_default_container()
-                if default_container:
-                    img_id = default_container
-                    env = cast(MutableMapping[Text, Text], os.environ)
+                if self.builder.find_default_container:
+                    default_container = self.builder.find_default_container()
+                    if default_container:
+                        img_id = default_container
+                        env = cast(MutableMapping[Text, Text], os.environ)
 
             if docker_req and img_id is None and kwargs.get("use_container"):
                 raise Exception("Docker image not available")

cwltool/process.py

@@ -570,7 +570,7 @@ def _init_job(self, joborder, **kwargs):
         if dockerReq is None and "default_container" in kwargs:
             defaultDocker = kwargs["default_container"]
 
-        if dockerReq or defaultDocker and kwargs.get("use_container"):
+        if (dockerReq or defaultDocker) and kwargs.get("use_container"):
             if dockerReq:
                 # Check if docker output directory is absolute
                 if dockerReq.get("dockerOutputDirectory") and dockerReq.get("dockerOutputDirectory").startswith('/'):