Skip to content
Snippets Groups Projects
Commit d2b891f9 authored by Marcel Loose's avatar Marcel Loose :sunglasses: Committed by alex
Browse files

Make all DockerRequirements hints

A few CWL-files list the DockerRequirement under requirements,
instead of hints, which precludes running the workflow as
`cwltool --no-container`. This has been fixed.


Former-commit-id: 088e9c30
parent 3c5b3467
No related branches found
No related tags found
No related merge requests found
...@@ -54,10 +54,11 @@ outputs: ...@@ -54,10 +54,11 @@ outputs:
outputBinding: outputBinding:
glob: ms_concat.log glob: ms_concat.log
label: ms_concat label: ms_concat
requirements: hints:
- class: ShellCommandRequirement
- class: DockerRequirement - class: DockerRequirement
dockerPull: 'lofareosc/prefactor:HBAcalibrator' dockerPull: 'lofareosc/prefactor:HBAcalibrator'
requirements:
- class: ShellCommandRequirement
- class: InitialWorkDirRequirement - class: InitialWorkDirRequirement
listing: listing:
- entry: $(inputs.msin) - entry: $(inputs.msin)
......
...@@ -41,7 +41,8 @@ outputs: ...@@ -41,7 +41,8 @@ outputs:
outputBinding: outputBinding:
glob: $(inputs.image_name)-image.fits glob: $(inputs.image_name)-image.fits
label: WSClean label: WSClean
requirements: hints:
- class: DockerRequirement - class: DockerRequirement
dockerPull: 'lofareosc/prefactor:HBAcalibrator' dockerPull: 'lofareosc/prefactor:HBAcalibrator'
requirements:
- class: InlineJavascriptRequirement - class: InlineJavascriptRequirement
...@@ -68,7 +68,7 @@ requirements: ...@@ -68,7 +68,7 @@ requirements:
skymodels = $(inputs.skymodels) skymodels = $(inputs.skymodels)
max_separation_arcmin = $(inputs.max_separation_arcmin) max_separation_arcmin = $(inputs.max_separation_arcmin)
max_separation_arcmin = 1.0 if max_separation_arcmin else max_separation_arcmin max_separation_arcmin = 1.0 if max_separation_arcmin is None else max_separation_arcmin
extension = "$(inputs.skymodels_extension)" extension = "$(inputs.skymodels_extension)"
if skymodels is None: if skymodels is None:
skymodels = "/data/skymodels" skymodels = "/data/skymodels"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment