Skip to content

Commit

Permalink
Merge pull request #233 from drpatelh/quay.io
Browse files Browse the repository at this point in the history
Move containers for pipeline to quay.io
  • Loading branch information
drpatelh authored Jun 7, 2023
2 parents 58d34f6 + 9b30fb1 commit cef9e13
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 21 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v2.3.2 - 2023-06-07 Patched Yellow Strontium Pinscher

- Move containers for pipeline to quay.io ([#233](https://github.com/nf-core/scrnaseq/pull/233))

## v2.3.1 - 2023-06-02 Yellow Strontium Pinscher

- Add `public_aws_ecr` config for using the AWS mirror of containers where possible ([#225](https://github.com/nf-core/scrnaseq/pull/225))
Expand Down
4 changes: 2 additions & 2 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ if(params.aligner == "universc") {
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
]
ext.args = "--attribute=gene_biotype:protein_coding --attribute=gene_biotype:lncRNA --attribute=gene_biotype:pseudogene"
container = "docker.io/nfcore/universc:1.2.5.1"
container = "nf-core/universc:1.2.5.1"
}
withName: CELLRANGER_MKREF {
publishDir = [
path: "${params.outdir}/cellranger/mkref",
mode: params.publish_dir_mode
]
container = "docker.io/nfcore/universc:1.2.5.1"
container = "nf-core/universc:1.2.5.1"
}
withName: UNIVERSC {
publishDir = [
Expand Down
15 changes: 15 additions & 0 deletions conf/public_aws_ecr.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ docker.registry = 'public.ecr.aws'
podman.registry = 'public.ecr.aws'

process {
withName: 'CELLRANGER_COUNT' {
container = 'quay.io/nf-core/cellranger:7.1.0'
}
withName: 'CELLRANGER_MKGTF' {
container = 'quay.io/nf-core/cellranger:7.1.0'
}
withName: 'CELLRANGER_MKREF' {
container = 'quay.io/nf-core/cellranger:7.1.0'
}
withName: 'CONCAT_H5AD' {
container = 'quay.io/biocontainers/scanpy:1.7.2--pyhdfd78af_0'
}
Expand All @@ -27,10 +36,16 @@ process {
withName: 'MTX_TO_H5AD' {
container = 'quay.io/biocontainers/scanpy:1.7.2--pyhdfd78af_0'
}
withName: 'MTX_TO_SEURAT' {
container = 'quay.io/nf-core/seurat:4.3.0'
}
withName: 'SAMPLESHEET_CHECK' {
container = 'quay.io/biocontainers/python:3.8.3'
}
withName: 'STAR_GENOMEGENERATE' {
container = 'quay.io/biocontainers/mulled-v2-1fa26d1ce03c295fe2fdcf85831a92fbcbd7e8c2:1df389393721fc66f3fd8778ad938ac711951107-0'
}
withName: 'UNIVERSC' {
container = 'quay.io/nf-core/universc:1.2.5.1'
}
}
10 changes: 5 additions & 5 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
"nf-core": {
"cellranger/count": {
"branch": "master",
"git_sha": "d68b2e6526fcd22a2a6349e0859dbdc9924df93d",
"git_sha": "4b7d4863a5883b76e6bff13b6e52468fab090c5b",
"installed_by": ["modules"]
},
"cellranger/mkgtf": {
"branch": "master",
"git_sha": "d68b2e6526fcd22a2a6349e0859dbdc9924df93d",
"git_sha": "4b7d4863a5883b76e6bff13b6e52468fab090c5b",
"installed_by": ["modules"]
},
"cellranger/mkref": {
"branch": "master",
"git_sha": "d68b2e6526fcd22a2a6349e0859dbdc9924df93d",
"git_sha": "4b7d4863a5883b76e6bff13b6e52468fab090c5b",
"installed_by": ["modules"]
},
"custom/dumpsoftwareversions": {
Expand All @@ -42,7 +42,7 @@
},
"kallistobustools/count": {
"branch": "master",
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
"git_sha": "de204d3c950f091336539ad74f0e47ddffe69ed4",
"installed_by": ["modules"]
},
"kallistobustools/ref": {
Expand All @@ -62,7 +62,7 @@
},
"universc": {
"branch": "master",
"git_sha": "b9829e1064382745d8dff7f1d74d2138d2864f71",
"git_sha": "4b7d4863a5883b76e6bff13b6e52468fab090c5b",
"installed_by": ["modules"]
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/local/mtx_to_seurat.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ process MTX_TO_SEURAT {
label 'process_medium'

conda "r-seurat"
container 'docker.io/satijalab/seurat:4.3.0'
container "nf-core/seurat:4.3.0"

input:
// inputs from cellranger nf-core module does not come in a single sample dir
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/cellranger/count/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/cellranger/mkgtf/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/cellranger/mkref/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/cellranger/mkref/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions modules/nf-core/kallistobustools/count/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions modules/nf-core/universc/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/universc/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ manifest {
description = """Pipeline for processing 10x Genomics single cell rnaseq data"""
mainScript = 'main.nf'
nextflowVersion = '!>=22.10.1'
version = '2.3.1'
version = '2.3.2'
doi = '10.5281/zenodo.3568187'
}

Expand Down

0 comments on commit cef9e13

Please sign in to comment.