[ARVADOS] created: 6ea807b2caf6c934f170b2e4d89c23c4a08ca69c

[Git user]

        at  6ea807b2caf6c934f170b2e4d89c23c4a08ca69c (commit)


commit 6ea807b2caf6c934f170b2e4d89c23c4a08ca69c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Mar 10 14:38:16 2017 -0500

    8567: Use Docker image repo+tag name instead of PDH so that API server can select correct image format.

diff --git a/sdk/cwl/arvados_cwl/arvdocker.py b/sdk/cwl/arvados_cwl/arvdocker.py
index f83add9..4fc8b8e 100644
--- a/sdk/cwl/arvados_cwl/arvdocker.py
+++ b/sdk/cwl/arvados_cwl/arvdocker.py
@@ -27,7 +27,7 @@ def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
     global cached_lookups_lock
     with cached_lookups_lock:
         if dockerRequirement["dockerImageId"] in cached_lookups:
-            return cached_lookups[dockerRequirement["dockerImageId"]]
+            return dockerRequirement["dockerImageId"]
 
     with SourceLine(dockerRequirement, "dockerImageId", WorkflowException):
         sp = dockerRequirement["dockerImageId"].split(":")
@@ -63,12 +63,10 @@ def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
         if not images:
             raise WorkflowException("Could not find Docker image %s:%s" % (image_name, image_tag))
 
-        pdh = api_client.collections().get(uuid=images[0][0]).execute()["portable_data_hash"]
-
         with cached_lookups_lock:
-            cached_lookups[dockerRequirement["dockerImageId"]] = pdh
+            cached_lookups[dockerRequirement["dockerImageId"]] = True
 
-        return pdh
+    return dockerRequirement["dockerImageId"]
 
 def arv_docker_clear_cache():
     global cached_lookups

-----------------------------------------------------------------------


hooks/post-receive
--