Skip to content

Commit 39b1021

Browse files
committed
Fix --no-container, add example combining Conda + explicit docker options.
Sorry about that @jxtx. This: ``` cwltool --no-container --beta-conda-dependencies tests/seqtk_seq_with_docker.cwl tests/seqtk_seq_job.json ``` is working for me now.
1 parent fd91fe1 commit 39b1021

File tree

2 files changed

+27
-1
lines changed

2 files changed

+27
-1
lines changed

cwltool/draft2tool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ def rm_pending_output_callback(output_callbacks, jobcachepending,
286286

287287
reffiles = copy.deepcopy(builder.files)
288288

289-
j = self.makeJobRunner(kwargs.get("find_default_container"))
289+
j = self.makeJobRunner(kwargs.get("use_container"))
290290
j.builder = builder
291291
j.joborder = builder.job
292292
j.stdin = None

tests/seqtk_seq_with_docker.cwl

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
cwlVersion: v1.0
2+
class: CommandLineTool
3+
id: "seqtk_seq"
4+
doc: "Convert to FASTA (seqtk)"
5+
inputs:
6+
- id: input1
7+
type: File
8+
inputBinding:
9+
position: 1
10+
prefix: "-a"
11+
outputs:
12+
- id: output1
13+
type: File
14+
outputBinding:
15+
glob: out
16+
baseCommand: ["seqtk", "seq"]
17+
arguments: []
18+
stdout: out
19+
hints:
20+
SoftwareRequirement:
21+
packages:
22+
- package: seqtk
23+
version:
24+
- '1.2'
25+
DockerRequirement:
26+
dockerPull: quay.io/biocontainers/seqtk:1.2--0

0 commit comments

Comments
 (0)