X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/060d38d627bd1e51dd2b3c6e7de9af6aa7d7b6f3..33f91bb5a4ed93e9cadf21920526daa53351dbea:/sdk/cwl/arvados_cwl/arvdocker.py diff --git a/sdk/cwl/arvados_cwl/arvdocker.py b/sdk/cwl/arvados_cwl/arvdocker.py index f42e6d8c9c..6b736a5a7d 100644 --- a/sdk/cwl/arvados_cwl/arvdocker.py +++ b/sdk/cwl/arvados_cwl/arvdocker.py @@ -36,7 +36,7 @@ def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid with SourceLine(dockerRequirement, "dockerImageId", WorkflowException): sp = dockerRequirement["dockerImageId"].split(":") image_name = sp[0] - image_tag = sp[1] if len(sp) > 1 else None + image_tag = sp[1] if len(sp) > 1 else "latest" images = arvados.commands.keepdocker.list_images_in_arv(api_client, 3, image_name=image_name, @@ -51,9 +51,8 @@ def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid if project_uuid: args.append("--project-uuid="+project_uuid) args.append(image_name) - if image_tag: - args.append(image_tag) - logger.info("Uploading Docker image %s", ":".join(args[1:])) + args.append(image_tag) + logger.info("Uploading Docker image %s:%s", image_name, image_tag) try: arvados.commands.keepdocker.main(args, stdout=sys.stderr) except SystemExit as e: