projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 7478-anm-spot-instances
[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 e59903f2dc33b3d69406ee1fbc92751bd78e9623..7508febb08cc8bd704d251cc0490ea045a75053b 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvdocker.py
+++ b/
sdk/cwl/arvados_cwl/arvdocker.py
@@
-45,7
+45,7
@@
def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
if not images:
# Fetch Docker image if necessary.
try:
if not images:
# Fetch Docker image if necessary.
try:
- cwltool.docker.get_image(dockerRequirement, pull_image)
+ cwltool.docker.
DockerCommandLineJob.
get_image(dockerRequirement, pull_image)
except OSError as e:
raise WorkflowException("While trying to get Docker image '%s', failed to execute 'docker': %s" % (dockerRequirement["dockerImageId"], e))
except OSError as e:
raise WorkflowException("While trying to get Docker image '%s', failed to execute 'docker': %s" % (dockerRequirement["dockerImageId"], e))
@@
-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)