From 533dbbd1d3780fc17c50b62f5b9adb1c5c005a92 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 5 Dec 2018 11:42:43 -0500 Subject: [PATCH] 14583: Delete arv:dockerCollectionPDH from DockerRequirement in RunInSingleContainer Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cwl/arvados_cwl/arvworkflow.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py index eb78a25fed..ea167d4044 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) -- 2.30.2