Skip to content

Commit

Permalink
Changed versions to dev
Browse files Browse the repository at this point in the history
  • Loading branch information
WackerO committed Oct 10, 2023
1 parent c30e7eb commit 6ca2eab
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ jobs:
environment.yml
- name: Build new docker image
if: env.MATCHED_FILES
run: docker build --no-cache . -t ghcr.io/qbic-pipelines/rnadeseq:2.2
run: docker build --no-cache . -t ghcr.io/qbic-pipelines/rnadeseq:dev

# Change the version above and the third version below before/after release
- name: Pull docker image
if: ${{ !env.MATCHED_FILES }}
run: |
docker pull ghcr.io/qbic-pipelines/rnadeseq:dev
docker tag ghcr.io/qbic-pipelines/rnadeseq:dev ghcr.io/qbic-pipelines/rnadeseq:2.2
docker tag ghcr.io/qbic-pipelines/rnadeseq:dev ghcr.io/qbic-pipelines/rnadeseq:dev
- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
Expand Down Expand Up @@ -94,14 +94,14 @@ jobs:
environment.yml
- name: Build new docker image
if: env.MATCHED_FILES
run: docker build --no-cache . -t ghcr.io/qbic-pipelines/rnadeseq:2.2
run: docker build --no-cache . -t ghcr.io/qbic-pipelines/rnadeseq:dev

# Change the version above and the third version below before/after release
- name: Pull docker image
if: ${{ !env.MATCHED_FILES }}
run: |
docker pull ghcr.io/qbic-pipelines/rnadeseq:dev
docker tag ghcr.io/qbic-pipelines/rnadeseq:dev ghcr.io/qbic-pipelines/rnadeseq:2.2
docker tag ghcr.io/qbic-pipelines/rnadeseq:dev ghcr.io/qbic-pipelines/rnadeseq:dev
- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ LABEL org.opencontainers.image.authors="Gisela Gabernet, Alexander Peltzer, Oska
LABEL org.opencontainers.image.licenses=MIT
COPY environment.yml /
#RUN conda install -c conda-forge mamba
RUN mamba env create --file /environment.yml -p /opt/conda/envs/qbic-pipelines-rnadeseq-2.2 && \
RUN mamba env create --file /environment.yml -p /opt/conda/envs/qbic-pipelines-rnadeseq-dev && \
mamba clean --all --yes
RUN apt-get update -qq && \
apt-get install -y zip procps ghostscript
# Add conda installation dir to PATH
ENV PATH /opt/conda/envs/qbic-pipelines-rnadeseq-2.2/bin:$PATH
ENV PATH /opt/conda/envs/qbic-pipelines-rnadeseq-dev/bin:$PATH
# Dump the details of the installed packates to a file for posterity
RUN mamba env export --name qbic-pipelines-rnadeseq-2.2 > qbic-pipelines-rnadeseq-2.2.yml
RUN mamba env export --name qbic-pipelines-rnadeseq-dev > qbic-pipelines-rnadeseq-dev.yml
# Instruct R processes to use these empty files instead of clashing with a local config
RUN touch .Rprofile
RUN touch .Renviron
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# You can use this file to create a conda environment for this pipeline:
# conda env create -f environment.yml
# use this to find packages: https://anaconda.org/
name: qbic-pipelines-rnadeseq-2.2
name: qbic-pipelines-rnadeseq-dev
channels:
- bioconda
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion modules/local/report.nf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
process REPORT {

container 'ghcr.io/qbic-pipelines/rnadeseq:2.2'
container 'ghcr.io/qbic-pipelines/rnadeseq:dev'

input:
path gene_counts
Expand Down
2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ manifest {
description = """Differential gene expression analysis and pathway analysis of RNAseq data"""
mainScript = 'main.nf'
nextflowVersion = '!>=23.04.0'
version = '2.2'
version = '2.3dev'
doi = ''
}

Expand Down

0 comments on commit 6ca2eab

Please sign in to comment.