X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7e38c190147681b7d2ce64601b1ac9661812fcd6..651e87d8d97edebd8d3cd0325dbd15d6dac0cd1c:/sdk/cwl/arvados_cwl/runner.py diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py index e76d6283f5..bb4fac2ae9 100644 --- a/sdk/cwl/arvados_cwl/runner.py +++ b/sdk/cwl/arvados_cwl/runner.py @@ -50,7 +50,7 @@ def find_defaults(d, op): if isinstance(d, list): for i in d: find_defaults(i, op) - if isinstance(d, dict): + elif isinstance(d, dict): if "default" in d: op(d) else: @@ -161,6 +161,8 @@ def upload_docker(arvrunner, tool): raise SourceLine(docker_req, "dockerOutputDirectory", UnsupportedRequirement).makeError( "Option 'dockerOutputDirectory' of DockerRequirement not supported.") arv_docker_get_image(arvrunner.api, docker_req, True, arvrunner.project_uuid) + else: + arv_docker_get_image(arvrunner.api, {"dockerPull": "arvados/jobs"}, True, arvrunner.project_uuid) elif isinstance(tool, cwltool.workflow.Workflow): for s in tool.steps: upload_docker(arvrunner, s.embedded_tool)