Skip to content

Commit eb69d44

Browse files
committed
fix to provide the song/score docker versions from params
1 parent d6389ec commit eb69d44

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

process/score_download.nf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ process scoreDownload {
3434
cpus params.cpus
3535
memory "${params.mem} GB"
3636

37-
container "overture/score:${params.container_version}"
38-
publishDir "${params.publish_dir}/${task.process.replaceAll(':', '_')}", mode: "copy", enabled: params.publish_dir
37+
container "overture/score:${params.score_container_version ?: params.container_version}"
38+
publishDir "${params.publish_dir}/${task.process.replaceAll(':', '_')}", mode: "copy", enabled: params.publish_dir ? true : false
3939

4040
label "scoreDownload"
4141
tag "${analysis_id}"

process/score_upload.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ process scoreUpload {
3131
cpus params.cpus
3232
memory "${params.mem} GB"
3333

34-
container "overture/score:${params.container_version}"
34+
container "overture/score:${params.score_container_version ?: params.container_version}"
3535

3636
tag "${analysis_id}"
3737

process/song_get_analysis.nf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ process songGetAnalysis {
3232
cpus params.cpus
3333
memory "${params.mem} GB"
3434

35-
container "overture/song-client:${params.container_version}"
36-
publishDir "${params.publish_dir}/${task.process.replaceAll(':', '_')}", mode: "copy", enabled: params.publish_dir
35+
container "overture/song-client:${params.song_container_version ?: params.container_version}"
36+
publishDir "${params.publish_dir}/${task.process.replaceAll(':', '_')}", mode: "copy", enabled: params.publish_dir ? true : false
3737

3838
tag "${analysis_id}"
3939

process/song_manifest.nf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ process songManifest {
2727
return params.max_retries ? 'retry' : 'finish'
2828
}
2929

30-
publishDir "${params.publish_dir}/${task.process.replaceAll(':', '_')}", mode: "copy", enabled: params.publish_dir
30+
publishDir "${params.publish_dir}/${task.process.replaceAll(':', '_')}", mode: "copy", enabled: params.publish_dir ? true : false
3131

3232
pod = [secret: workflow.runName + "-secret", mountPath: "/tmp/rdpc_secret"]
3333

3434
cpus params.cpus
3535
memory "${params.mem} GB"
3636

37-
container "overture/song-client:${params.container_version}"
37+
container "overture/song-client:${params.song_container_version ?: params.container_version}"
3838

3939
tag "${analysis_id}"
4040

process/song_publish.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ process songPublish {
3030
cpus params.cpus
3131
memory "${params.mem} GB"
3232

33-
container "overture/song-client:${params.container_version}"
33+
container "overture/song-client:${params.song_container_version ?: params.container_version}"
3434

3535
tag "${analysis_id}"
3636

process/song_submit.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ process songSubmit {
3030
cpus params.cpus
3131
memory "${params.mem} GB"
3232

33-
container "overture/song-client:${params.container_version}"
33+
container "overture/song-client:${params.song_container_version ?: params.container_version}"
3434

3535
tag "${study_id}"
3636
label "songSubmit"

0 commit comments

Comments
 (0)