Skip to content

Commit

Permalink
Matched conda versions with docker/singularity using wave containers
Browse files Browse the repository at this point in the history
  • Loading branch information
GallVp committed Aug 29, 2024
1 parent f0cc76e commit 9805df4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
3 changes: 1 addition & 2 deletions modules/nf-core/untarfiles/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ name: untarfiles
channels:
- conda-forge
- bioconda
- defaults

dependencies:
- bioconda::grep=3.4
- conda-forge::sed=4.7
- conda-forge::sed=4.8
- conda-forge::tar=1.34
4 changes: 2 additions & 2 deletions modules/nf-core/untarfiles/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ process UNTARFILES {

conda "${moduleDir}/environment.yml"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'nf-core/ubuntu:20.04' }"
'oras://community.wave.seqera.io/library/grep_sed_tar:40b34489f8e82876' :
'community.wave.seqera.io/library/grep_sed_tar:16f6591cd62505b3' }"

input:
tuple val(meta), path(archive)
Expand Down
22 changes: 11 additions & 11 deletions modules/nf-core/untarfiles/tests/main.nf.test.snap
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
]
],
"1": [
"versions.yml:md5,9027b256bc1fa1eee1e00805bec9a223"
"versions.yml:md5,4414b00143ed6076881ba7c68ed8b6cf"
],
"files": [
[
Expand All @@ -22,15 +22,15 @@
]
],
"versions": [
"versions.yml:md5,9027b256bc1fa1eee1e00805bec9a223"
"versions.yml:md5,4414b00143ed6076881ba7c68ed8b6cf"
]
}
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "24.04.4"
},
"timestamp": "2024-08-28T15:53:24.857391"
"timestamp": "2024-08-29T12:22:11.239416"
},
"test-untarfiles": {
"content": [
Expand All @@ -48,7 +48,7 @@
]
],
"1": [
"versions.yml:md5,9027b256bc1fa1eee1e00805bec9a223"
"versions.yml:md5,4414b00143ed6076881ba7c68ed8b6cf"
],
"files": [
[
Expand All @@ -63,15 +63,15 @@
]
],
"versions": [
"versions.yml:md5,9027b256bc1fa1eee1e00805bec9a223"
"versions.yml:md5,4414b00143ed6076881ba7c68ed8b6cf"
]
}
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "24.04.4"
},
"timestamp": "2024-08-28T15:52:57.207155"
"timestamp": "2024-08-29T12:21:44.153411"
},
"test-untarfiles-different-output-path": {
"content": [
Expand Down Expand Up @@ -311,14 +311,14 @@
"s_1_1101.stats"
],
[
"versions.yml:md5,9027b256bc1fa1eee1e00805bec9a223"
"versions.yml:md5,4414b00143ed6076881ba7c68ed8b6cf"
]
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "24.04.4"
},
"timestamp": "2024-08-28T16:01:51.751361"
"timestamp": "2024-08-29T12:22:01.056904"
},
"test-untarfiles-onlyfiles": {
"content": [
Expand All @@ -332,7 +332,7 @@
]
],
"1": [
"versions.yml:md5,9027b256bc1fa1eee1e00805bec9a223"
"versions.yml:md5,4414b00143ed6076881ba7c68ed8b6cf"
],
"files": [
[
Expand All @@ -343,14 +343,14 @@
]
],
"versions": [
"versions.yml:md5,9027b256bc1fa1eee1e00805bec9a223"
"versions.yml:md5,4414b00143ed6076881ba7c68ed8b6cf"
]
}
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "24.04.4"
},
"timestamp": "2024-08-28T15:53:19.654349"
"timestamp": "2024-08-29T12:22:06.329486"
}
}

0 comments on commit 9805df4

Please sign in to comment.