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 6b736a5a7d872ff60eae3bdeffc1e55c66de40c0..7508febb08cc8bd704d251cc0490ea045a75053b 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvdocker.py
+++ b/
sdk/cwl/arvados_cwl/arvdocker.py
@@
-33,7
+33,7
@@
def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
if dockerRequirement["dockerImageId"] in cached_lookups:
return dockerRequirement["dockerImageId"]
if dockerRequirement["dockerImageId"] in cached_lookups:
return dockerRequirement["dockerImageId"]
- with SourceLine(dockerRequirement, "dockerImageId", WorkflowException):
+ with SourceLine(dockerRequirement, "dockerImageId", WorkflowException
, logger.isEnabledFor(logging.DEBUG)
):
sp = dockerRequirement["dockerImageId"].split(":")
image_name = sp[0]
image_tag = sp[1] if len(sp) > 1 else "latest"
sp = dockerRequirement["dockerImageId"].split(":")
image_name = sp[0]
image_tag = sp[1] if len(sp) > 1 else "latest"
@@
-44,7
+44,10
@@
def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
if not images:
# Fetch Docker image if necessary.
if not images:
# Fetch Docker image if necessary.
- cwltool.docker.get_image(dockerRequirement, pull_image)
+ try:
+ 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))
# Upload image to Arvados
args = []
# Upload image to Arvados
args = []
@@
-54,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)