X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ad8c74a419972e173bd5fd75595d9893b58fc154..d89fc97f4a7ee74edcb1a5856fec560c748b9086:/sdk/cwl/arvados_cwl/arvdocker.py

diff --git a/sdk/cwl/arvados_cwl/arvdocker.py b/sdk/cwl/arvados_cwl/arvdocker.py
index 253df99304..c75e783ac2 100644
--- a/sdk/cwl/arvados_cwl/arvdocker.py
+++ b/sdk/cwl/arvados_cwl/arvdocker.py
@@ -1,7 +1,11 @@
 import logging
+import sys
+
 import cwltool.docker
+from cwltool.errors import WorkflowException
 import arvados.commands.keepdocker
 
+
 logger = logging.getLogger('arvados.cwl-runner')
 
 def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid):
@@ -24,7 +28,10 @@ def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
         if image_tag:
             args.append(image_tag)
         logger.info("Uploading Docker image %s", ":".join(args[1:]))
-        arvados.commands.keepdocker.main(args, stdout=sys.stderr)
+        try:
+            arvados.commands.keepdocker.main(args, stdout=sys.stderr)
+        except SystemExit:
+            raise WorkflowException()
 
     images = arvados.commands.keepdocker.list_images_in_arv(api_client, 3,
                                                             image_name=image_name,