Merge pull request #475 from kapilkd13/container-correction

Container correction: Adding missing Docker container in conformance tests
common-workflow-language · Jul 10, 2017 · 557bd4f · 557bd4f
2 parents 8f26c9b + f30c103
commit 557bd4f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/v1.0/v1.0/binding-test.cwl b/v1.0/v1.0/binding-test.cwl
@@ -2,7 +2,9 @@
 
 class: CommandLineTool
 cwlVersion: v1.0
-
+hints:
+  - class: DockerRequirement
+    dockerPull: python:2-slim
 inputs:
   - id: reference
     type: File

diff --git a/v1.0/v1.0/cat1-testcli.cwl b/v1.0/v1.0/cat1-testcli.cwl
@@ -3,6 +3,12 @@
     "class": "CommandLineTool",
     "cwlVersion": "v1.0",
     "doc": "Print the contents of a file to stdout using 'cat' running in a docker container.",
+    "hints": [
+        {
+            "class": "DockerRequirement",
+            "dockerPull": "python:2-slim"
+        }
+    ],
     "inputs": [
         {
             "id": "file1",

diff --git a/v1.0/v1.0/search.cwl b/v1.0/v1.0/search.cwl
@@ -2,7 +2,7 @@ cwlVersion: v1.0
 $graph:
 - id: index
   class: CommandLineTool
-  baseCommand: python2
+  baseCommand: python
   arguments:
     - valueFrom: input.txt
       position: 1
@@ -12,6 +12,9 @@ $graph:
         - entryname: input.txt
           entry: $(inputs.file)
     - class: InlineJavascriptRequirement
+  hints:
+    - class: DockerRequirement
+      dockerPull: python:2-slim
 
   inputs:
     file:  File
@@ -36,9 +39,12 @@ $graph:
 
 - id: search
   class: CommandLineTool
-  baseCommand: python2
+  baseCommand: python
   requirements:
     - class: InlineJavascriptRequirement
+  hints:
+    - class: DockerRequirement
+      dockerPull: python:2-slim
   inputs:
     file:
       type: File

diff --git a/v1.0/v1.0/stagefile.cwl b/v1.0/v1.0/stagefile.cwl
@@ -1,5 +1,8 @@
 class: CommandLineTool
 cwlVersion: v1.0
+hints:
+  - class: DockerRequirement
+    dockerPull: python:2-slim
 requirements:
   InitialWorkDirRequirement:
     listing:

diff --git a/v1.0/v1.0/tmap-tool.cwl b/v1.0/v1.0/tmap-tool.cwl
@@ -3,7 +3,12 @@
     "cwlVersion": "v1.0",
 
     "class": "CommandLineTool",
-
+    "hints": [
+        {
+            "class": "DockerRequirement",
+            "dockerPull": "python:2-slim"
+        }
+    ],
     "inputs": [
         {
             "id": "reads",