Skip to content

Commit

Permalink
Bump container rnaseq-nf:v1.3.0
Browse files Browse the repository at this point in the history
Signed-off-by: Paolo Di Tommaso <[email protected]>
  • Loading branch information
pditommaso committed Oct 22, 2024
1 parent 79c4244 commit 0a5627d
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 30 deletions.
12 changes: 5 additions & 7 deletions conda.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
name: rnaseq-nf
channels:
- seqera
- bioconda
- conda-forge
- defaults
- conda-forge
- bioconda
dependencies:
- salmon=1.10.2
- fastqc=0.12.1
- multiqc=1.15
- bioconda::fastqc=0.12.1
- bioconda::multiqc=1.25
- bioconda::salmon=1.10.3
21 changes: 10 additions & 11 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
FROM mambaorg/micromamba
#
# don't waste time with this
# use seqera containers
# https://seqera.io/containers/
#
FROM mambaorg/micromamba:1.5.10-noble
MAINTAINER Paolo Di Tommaso <[email protected]>

RUN \
micromamba install -y -n base -c defaults -c bioconda -c conda-forge \
salmon=1.10.2 \
fastqc=0.12.1 \
multiqc=1.17 \
python=3.11 \
typing_extensions \
importlib_metadata \
procps-ng \
&& micromamba clean -a -y
COPY --chown=$MAMBA_USER:$MAMBA_USER conda.yml /tmp/conda.yml
RUN micromamba install -y -n base -f /tmp/conda.yml \
&& micromamba install -y -n base conda-forge::procps-ng \
&& micromamba clean -a -y

ENV PATH="$MAMBA_ROOT_PREFIX/bin:$PATH"
USER root
6 changes: 3 additions & 3 deletions docker/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
version ?= v1.2.1
version ?= v1.3.0

all: build push

build:
cp ../conda.yml .
docker build --output=type=docker --progress=plain --tag quay.io/nextflow/rnaseq-nf:${version} .
docker build --output=type=docker --progress=plain --tag docker.io/nextflow/rnaseq-nf:${version} .

push:
docker push quay.io/nextflow/rnaseq-nf:${version}
docker push docker.io/nextflow/rnaseq-nf:${version}
18 changes: 9 additions & 9 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ params.multiqc = "${projectDir}/multiqc"

profiles {
standard {
process.container = 'docker.io/nextflow/rnaseq-nf:v1.2.1'
process.container = 'docker.io/nextflow/rnaseq-nf:v1.3.0'
}

'all-reads' {
Expand All @@ -54,12 +54,12 @@ profiles {
}

'docker' {
process.container = 'docker.io/nextflow/rnaseq-nf:v1.2.1'
process.container = 'docker.io/nextflow/rnaseq-nf:v1.3.0'
docker.enabled = true
}

'singularity' {
process.container = 'docker.io/nextflow/rnaseq-nf:v1.2.1'
process.container = 'docker.io/nextflow/rnaseq-nf:v1.3.0'
singularity.enabled = true
singularity.autoMounts = true
}
Expand All @@ -70,15 +70,15 @@ profiles {
}

'slurm' {
process.container = 'docker.io/nextflow/rnaseq-nf:v1.2.1'
process.container = 'docker.io/nextflow/rnaseq-nf:v1.3.0'
process.executor = 'slurm'
singularity.enabled = true
}

'batch' {
params.reads = 's3://rnaseq-nf/data/ggal/lung_{1,2}.fq'
params.transcriptome = 's3://rnaseq-nf/data/ggal/transcript.fa'
process.container = 'docker.io/nextflow/rnaseq-nf:v1.2.1'
process.container = 'docker.io/nextflow/rnaseq-nf:v1.3.0'
process.executor = 'awsbatch'
process.queue = 'nextflow-ci'
workDir = 's3://nextflow-ci/work'
Expand All @@ -87,7 +87,7 @@ profiles {
}

's3-data' {
process.container = 'docker.io/nextflow/rnaseq-nf:v1.2.1'
process.container = 'docker.io/nextflow/rnaseq-nf:v1.3.0'
params.reads = 's3://rnaseq-nf/data/ggal/lung_{1,2}.fq'
params.transcriptome = 's3://rnaseq-nf/data/ggal/transcript.fa'
}
Expand All @@ -97,19 +97,19 @@ profiles {
params.reads = 'gs://rnaseq-nf/data/ggal/gut_{1,2}.fq'
params.multiqc = 'gs://rnaseq-nf/multiqc'
process.executor = 'google-batch'
process.container = 'docker.io/nextflow/rnaseq-nf:v1.2.1'
process.container = 'docker.io/nextflow/rnaseq-nf:v1.3.0'
workDir = 'gs://rnaseq-nf/scratch' // <- replace with your own bucket!
google.region = 'europe-west2'
}

'gs-data' {
process.container = 'docker.io/nextflow/rnaseq-nf:v1.2.1'
process.container = 'docker.io/nextflow/rnaseq-nf:v1.3.0'
params.transcriptome = 'gs://rnaseq-nf/data/ggal/transcript.fa'
params.reads = 'gs://rnaseq-nf/data/ggal/gut_{1,2}.fq'
}

'azure-batch' {
process.container = 'docker.io/nextflow/rnaseq-nf:v1.2.1'
process.container = 'docker.io/nextflow/rnaseq-nf:v1.3.0'
workDir = 'az://nf-scratch/work'
process.executor = 'azurebatch'
process.queue = 'nextflow-ci' // replace with your own Azure pool name
Expand Down

0 comments on commit 0a5627d

Please sign in to comment.