[ARVADOS] created: 1.3.0-4-g533dbbd1d

[Git user]

        at  533dbbd1d3780fc17c50b62f5b9adb1c5c005a92 (commit)


commit 533dbbd1d3780fc17c50b62f5b9adb1c5c005a92
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Dec 5 11:42:43 2018 -0500

    14583: Delete arv:dockerCollectionPDH from DockerRequirement in RunInSingleContainer
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py
index eb78a25fe..ea167d404 100644
--- a/sdk/cwl/arvados_cwl/arvworkflow.py
+++ b/sdk/cwl/arvados_cwl/arvworkflow.py
@@ -205,6 +205,9 @@ class ArvadosWorkflow(Workflow):
                                                     raise WorkflowException("Non-top-level ResourceRequirement in single container cannot have expressions")
                                 if not dyn:
                                     self.static_resource_req.append(req)
+                            if req["class"] == "DockerRequirement":
+                                if "http://arvados.org/cwl#dockerCollectionPDH" in req:
+                                    del req["http://arvados.org/cwl#dockerCollectionPDH"]
 
                 visit_class(packed["$graph"], ("Workflow", "CommandLineTool"), visit)
 

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


hooks/post-receive
--