From 0d04a064b3c3ae071e0148b76ad9a7a12972cf66 Mon Sep 17 00:00:00 2001 From: James Fellows Yates Date: Thu, 14 Jan 2021 11:40:54 +0100 Subject: [PATCH 1/2] Version bump for patch-release --- .github/workflows/ci.yml | 4 ++-- CHANGELOG.md | 4 +++- Dockerfile | 4 ++-- environment.yml | 2 +- nextflow.config | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 497880f73..21eddc702 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,13 +34,13 @@ jobs: - name: Build new docker image if: env.MATCHED_FILES - run: docker build --no-cache . -t nfcore/eager:dev + run: docker build --no-cache . -t nfcore/eager:2.3.1 - name: Pull docker image if: ${{ !env.MATCHED_FILES }} run: | docker pull nfcore/eager:dev - docker tag nfcore/eager:dev nfcore/eager:dev + docker tag nfcore/eager:dev nfcore/eager:2.3.1 - name: Install Nextflow env: diff --git a/CHANGELOG.md b/CHANGELOG.md index a5ae861cd..bbcfcb934 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [2.3.1dev] - Unreleased +## [2.3.1] - 2021-14 ### `Added` ### `Fixed` +- Fixed issue with Docker container not being pullable by Nextflow + ### `Dependencies` ### `Deprecated` diff --git a/Dockerfile b/Dockerfile index 6a9e54a34..653c46c19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,10 @@ COPY environment.yml / RUN conda env create --quiet -f /environment.yml && conda clean -a # Add conda installation dir to PATH (instead of doing 'conda activate') -ENV PATH /opt/conda/envs/nf-core-eager-2.3.1dev/bin:$PATH +ENV PATH /opt/conda/envs/nf-core-eager-2.3.1/bin:$PATH # Dump the details of the installed packages to a file for posterity -RUN conda env export --name nf-core-eager-2.3.1dev > nf-core-eager-2.3.1dev.yml +RUN conda env export --name nf-core-eager-2.3.1 > nf-core-eager-2.3.1.yml # Instruct R processes to use these empty files instead of clashing with a local version RUN touch .Rprofile diff --git a/environment.yml b/environment.yml index 041e7e3ea..e971624c5 100644 --- a/environment.yml +++ b/environment.yml @@ -1,6 +1,6 @@ # You can use this file to create a conda environment for this pipeline: # conda env create -f environment.yml -name: nf-core-eager-2.3.1dev +name: nf-core-eager-2.3.1 channels: - conda-forge - bioconda diff --git a/nextflow.config b/nextflow.config index 176fe859b..e4c0ddfd6 100644 --- a/nextflow.config +++ b/nextflow.config @@ -251,7 +251,7 @@ params { // Container slug. Stable releases should specify release tag! // Developmental code should specify :dev -process.container = 'nfcore/eager:dev' +process.container = 'nfcore/eager:2.3.1' // Load base.config by default for all pipelines includeConfig 'conf/base.config' @@ -345,7 +345,7 @@ manifest { description = 'A fully reproducible and state-of-the-art ancient DNA analysis pipeline' mainScript = 'main.nf' nextflowVersion = '!>=20.04.0' - version = '2.3.1dev' + version = '2.3.1' } // Function to ensure that resource requirements don't go beyond From 9d87d69243f90c4ea9df04181e8df57a22803227 Mon Sep 17 00:00:00 2001 From: "James A. Fellows Yates" Date: Thu, 14 Jan 2021 11:46:16 +0100 Subject: [PATCH 2/2] Linting --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4b8a0c27..2e4985f0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [2.3.1] - 2021-01-14 +## [2.3.1] - 2021-01-14 ### `Added`