Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set docker_enabled and docker tag for eu tools that can only run with docker #18

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,8 @@ tools:
cores: 8
toolshed.g2.bx.psu.edu/repos/gbcs-embl-heidelberg/je_markdupes/je_markdupes/.*:
cores: 8
toolshed.g2.bx.psu.edu/repos/goeckslab/mesmer/mesmer/.*:
inherits: __docker_tool
toolshed.g2.bx.psu.edu/repos/guerler/charts/charts/.*:
mem: 10
toolshed.g2.bx.psu.edu/repos/imgteam/projective_transformation/ip_projective_transformation/.*:
Expand Down Expand Up @@ -2165,6 +2167,16 @@ tools:
toolshed.g2.bx.psu.edu/repos/nml/spades/spades/.*:
cores: 20
mem: 330
toolshed.g2.bx.psu.edu/repos/perssond/basic_illumination/basic_illumination/.*:
inherits: __docker_tool
toolshed.g2.bx.psu.edu/repos/perssond/coreograph/unet_coreograph/.*:
inherits: __docker_tool
toolshed.g2.bx.psu.edu/repos/perssond/quantification/quantification/.*:
inherits: __docker_tool
toolshed.g2.bx.psu.edu/repos/perssond/s3segmenter/s3segmenter/.*:
inherits: __docker_tool
toolshed.g2.bx.psu.edu/repos/perssond/unmicst/unmicst/.*:
inherits: __docker_tool
toolshed.g2.bx.psu.edu/repos/peterjc/blast2go/blast2go/.*:
mem: 20
toolshed.g2.bx.psu.edu/repos/peterjc/mira_assembler/mira_assembler/.*:
Expand All @@ -2177,6 +2189,8 @@ tools:
mem: 34.2
toolshed.g2.bx.psu.edu/repos/pjbriggs/trimmomatic/trimmomatic/.*:
cores: 3
toolshed.g2.bx.psu.edu/repos/q2d2/qiime2.*:
inherits: __docker_tool
toolshed.g2.bx.psu.edu/repos/rnateam/blockbuster/blockbuster/.*:
mem: 64
toolshed.g2.bx.psu.edu/repos/rnateam/blockclust/blockclust/.*:
Expand Down Expand Up @@ -2293,6 +2307,13 @@ tools:
mem: 8
Extract genomic DNA 1:
cores: 3
__docker_tool:
Copy link
Member

@nuwang nuwang Apr 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it may make sense to rename this to __docker_only_tool, as most tools can run with docker. Also, would this run with singularity also? If so, perhaps it should be renamed to container_only_tool?

Suggested change
__docker_tool:
__docker_only_tool:

In general, I've been wondering about the best way to support docker, especially for scenarios like these where the container hasn't worked and we've had to override it manually: https://github.com/galaxyproject/galaxy-helm/blob/697f744f1258f5efccaf52cc3be79e1177ad79fc/galaxy/values.yaml#L524

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a very good point. These tools all have only a docker type requirement in the tag but I forgot that these tools can also run with singularity, so setting require: [docker] is too restrictive, as is setting the docker_enabled param. I don't know if this PR makes sense - perhaps this logic belongs in local configuration.

Copy link
Member

@nuwang nuwang Apr 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if we just rename require: [docker] to require: [container]? The specific configuration for which container etc. is left to local configuration.
I think this information being in the shared database is useful, because you can't realistically expect to run these tools otherwise?

params:
docker_enabled: true
scheduling:
require:
- docker
abstract: true
bfast_wrapper:
cores: 10
mem: 20
Expand Down