projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
9799: Merge branch 'master' into 9799-nonadmin-logs
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
arvdocker.py
diff --git
a/sdk/cwl/arvados_cwl/arvdocker.py
b/sdk/cwl/arvados_cwl/arvdocker.py
index 3cc1a42ae2a0693ae0b7494fed9849eadc417e89..c75e783ac2de0a0cdf967386983681ff4e5da678 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvdocker.py
+++ b/
sdk/cwl/arvados_cwl/arvdocker.py
@@
-1,7
+1,10
@@
import logging
import logging
+import sys
+
import cwltool.docker
import cwltool.docker
+from cwltool.errors import WorkflowException
import arvados.commands.keepdocker
import arvados.commands.keepdocker
-import sys
+
logger = logging.getLogger('arvados.cwl-runner')
logger = logging.getLogger('arvados.cwl-runner')
@@
-25,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:]))
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,
images = arvados.commands.keepdocker.list_images_in_arv(api_client, 3,
image_name=image_name,