Merge pull request #268 from chapmanb/tests-docker-hints

Tests: move Docker from requirements to hints

Author: tetron

v1.0/v1.0/template-tool.cwl

@@ -2,8 +2,6 @@
 cwlVersion: v1.0
 class: CommandLineTool
 requirements:
-  - class: DockerRequirement
-    dockerPull: "debian:8"
   - class: InlineJavascriptRequirement
     expressionLib:
       - { $include: underscore.js }
@@ -12,6 +10,9 @@ requirements:
     listing:
       - entryname: foo.txt
         entry: $(t("The file is <%= inputs.file1.path.split('/').slice(-1)[0] %>\n"))
+hints:
+  DockerRequirement:
+    dockerPull: "debian:8"
 inputs:
   - id: file1
     type: File

v1.0/v1.0/test-cwl-out.cwl

@@ -2,8 +2,9 @@ class: CommandLineTool
 cwlVersion: v1.0
 requirements:
   - class: ShellCommandRequirement
-  - class: DockerRequirement
-    dockerPull: debian:wheezy
+hints:
+  DockerRequirement:
+    dockerPull: "debian:wheezy"
 
 inputs: []