Merge branch 'BIOWDL-247' of https://github.com/biowdl/tasks into BIOWDL-247

cutadapt.wdl

@@ -62,8 +62,8 @@ task Cutadapt {
         String? reportPath
 
         Int cores = 1
-        Int memory = 16
-        String dockerTag = "2.3--py36h14c3975_0"
+        Int memory = 16  # FIXME: Insane memory. Double-check if needed.
+        String dockerImage = "quay.io/biocontainers/cutadapt:2.3--py36h14c3975_0"
     }
 
     String read2outputArg = if (defined(read2output))
@@ -169,6 +169,6 @@ task Cutadapt {
     runtime {
         cpu: cores
         memory: memory
-        docker: "quay.io/biocontainers/cutadapt:" + dockerTag
+        docker: dockerImage
     }
 }

fastqc.wdl

@@ -18,7 +18,7 @@ task Fastqc {
         String? dir
 
         Int threads = 1
-        String dockerTag = "0.11.7--4"
+        String dockerImage = "quay.io/biocontainers/fastqc:0.11.7--4"
         Array[File]? NoneArray
         File? NoneFile
     }
@@ -61,7 +61,7 @@ task Fastqc {
 
     runtime {
         cpu: threads
-        docker: "quay.io/biocontainers/fastqc:" + dockerTag
+        docker: dockerImage
     }
 }