Skip to content

Commit

Permalink
Merge pull request #2140 from nf-core/explicitly-disable-conda-contai…
Browse files Browse the repository at this point in the history
…ner-profiles

Explicitly disable conda container profiles
  • Loading branch information
ewels committed Dec 23, 2022
2 parents 39c6bcd + a09c060 commit 69060a8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

- Fix the syntax of github_output in GitHub actions ([#2114](https://github.com/nf-core/tools/pull/2114))
- Fix a bug introduced in 2.7 that made pipelines hang ([#2132](https://github.com/nf-core/tools/issues/2132))
- Explicitly disable `conda` when a container profile ([#2140](https://github.com/nf-core/tools/pull/2140))

### Linting

Expand Down
5 changes: 5 additions & 0 deletions nf_core/pipeline-template/nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ profiles {
docker {
docker.enabled = true
docker.userEmulation = true
conda.enabled = false
singularity.enabled = false
podman.enabled = false
shifter.enabled = false
Expand All @@ -113,27 +114,31 @@ profiles {
singularity {
singularity.enabled = true
singularity.autoMounts = true
conda.enabled = false
docker.enabled = false
podman.enabled = false
shifter.enabled = false
charliecloud.enabled = false
}
podman {
podman.enabled = true
conda.enabled = false
docker.enabled = false
singularity.enabled = false
shifter.enabled = false
charliecloud.enabled = false
}
shifter {
shifter.enabled = true
conda.enabled = false
docker.enabled = false
singularity.enabled = false
podman.enabled = false
charliecloud.enabled = false
}
charliecloud {
charliecloud.enabled = true
conda.enabled = false
docker.enabled = false
singularity.enabled = false
podman.enabled = false
Expand Down

0 comments on commit 69060a8

Please sign in to comment.