From 937dc41afa272e9824ec7587d2b366f798331046 Mon Sep 17 00:00:00 2001 From: martindemko <325073@mail.muni.cz> Date: Fri, 5 Jun 2026 00:35:18 +0200 Subject: [PATCH] fixes handling singularity cache for docker images --- .../tpv_rules_local.yml | 3 ++- templates/galaxy/config/tpv_rules_meta.yml.j2 | 13 ++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/files/repeatexplorer-elixir.cerit-sc.cz/tpv_rules_local.yml b/files/repeatexplorer-elixir.cerit-sc.cz/tpv_rules_local.yml index 862bc6a..1b5dae9 100644 --- a/files/repeatexplorer-elixir.cerit-sc.cz/tpv_rules_local.yml +++ b/files/repeatexplorer-elixir.cerit-sc.cz/tpv_rules_local.yml @@ -173,7 +173,7 @@ tools: context: scratch: 64 walltime: 168 - + # ReapeatExplorer tools http://toolshed.g2.bx.psu.edu/repos/petr-novak/repeatexplorer2_testing toolshed.g2.bx.psu.edu/repos/petr-novak/repeatexplorer2_testing/repeatexplorer2/.*: cores: 10 @@ -186,6 +186,7 @@ tools: - conda require: - singularity + - repex container_resolvers: - type: cached_explicit_singularity cache_directory: "$SINGULARITY_CACHEDIR" diff --git a/templates/galaxy/config/tpv_rules_meta.yml.j2 b/templates/galaxy/config/tpv_rules_meta.yml.j2 index 02e0ebc..39601ac 100644 --- a/templates/galaxy/config/tpv_rules_meta.yml.j2 +++ b/templates/galaxy/config/tpv_rules_meta.yml.j2 @@ -374,7 +374,7 @@ destinations: --env JAVA_OPTS="-Xmx{int(mem)}g -Djava.io.tmpdir=$SCRATCHDIR" --env JAVA_TOOL_OPTIONS="-Xmx{int(mem)}g -Djava.io.tmpdir=$SCRATCHDIR" env: - SINGULARITY_CACHEDIR: "/cvmfs/singularity.galaxyproject.org/all/" + SINGULARITY_CACHEDIR: $SCRATCHDIR SINGULARITY_TMPDIR: $SCRATCHDIR XDG_CACHE_HOME: $SCRATCHDIR scheduling: @@ -456,3 +456,14 @@ destinations: scheduling: require: - alphafold + tpv_pulsar_repex: + inherits: tpv_pulsar + env: + SINGULARITY_CACHEDIR: "/storage/brno11-elixir/home/galaxyelixir/pulsar-re/files/singularity_cache" + container_resolvers: + - type: explicit_singularity + - cache_directory: "$SINGULARITY_CACHEDIR" + type: cached_mulled_singularity + scheduling: + require: + - repex