From ad8881f0577e8f1d76fc966b5f2291e853b42f7d Mon Sep 17 00:00:00 2001 From: nservant <nicolas.servant@curie.fr> Date: Tue, 2 Apr 2019 10:48:06 +0200 Subject: [PATCH] update images for travis and docker --- .travis.yml | 2 +- nextflow.config | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 381c4cf..f005f84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: # PRs to master are only ok if coming from dev branch - '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && [ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ])' # Pull the docker image first so the test doesn't wait for this - - docker pull nfcore/hic:dev + - docker pull nservant/nf-core-hic:dev # Fake the tag locally so that the pipeline runs properly - docker tag nfcore/hic:dev nfcore/hic:latest diff --git a/nextflow.config b/nextflow.config index 7bf286a..b4efd7c 100644 --- a/nextflow.config +++ b/nextflow.config @@ -12,8 +12,9 @@ params { // Container slug. Stable releases should specify release tag! - // Developmental code should specify :latest - container = 'nfcore/hic:latest' + // Developmental code should specify :latest + //container = 'nfcore/hic:latest' + container = 'nservant/nf-core-hic:latest' // Workflow flags // TODO nf-core: Specify your pipeline's command line flags @@ -35,6 +36,7 @@ params { custom_config_version = 'master' } + // Load base.config by default for all pipelines includeConfig 'conf/base.config' -- GitLab