projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12960-migrate-properties' closes #12960
[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 5483ccbf52b59f2d2133bacd76ad7eaaa775a91f..7508febb08cc8bd704d251cc0490ea045a75053b 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvdocker.py
+++ b/
sdk/cwl/arvados_cwl/arvdocker.py
@@
-57,7
+57,8
@@
def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
args.append(image_tag)
logger.info("Uploading Docker image %s:%s", image_name, image_tag)
try:
args.append(image_tag)
logger.info("Uploading Docker image %s:%s", image_name, image_tag)
try:
- arvados.commands.keepdocker.main(args, stdout=sys.stderr)
+ arvados.commands.put.api_client = api_client
+ arvados.commands.keepdocker.main(args, stdout=sys.stderr, install_sig_handlers=False, api=api_client)
except SystemExit as e:
if e.code:
raise WorkflowException("keepdocker exited with code %s" % e.code)
except SystemExit as e:
if e.code:
raise WorkflowException("keepdocker exited with code %s" % e.code)