Skip to content

Fix and improve singularity cache handling #156

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.

Sign up for GitHub

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix and improve singularity cache handling #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7efcb4d
Adds proper SINGULARITY_CACHEDIR variables
martindemko Apr 17, 2025
5ebbaa1
adds cached_explicit_singularity
martindemko Apr 17, 2025
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
15 changes: 8 additions & 7 deletions group_vars/galaxyservers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,15 @@ galaxy_config:
- /cvmfs/data.galaxyproject.org/managed/location/tool_data_table_conf.xml
# Tool Dependencies
container_resolvers:
- type: cached_explicit_singularity
cache_directory: "/storage/{{ pulsar.nfs_home }}/home/{{ pulsar.user_name }}/.singularity/cache/"
- type: explicit_singularity
- cache_directory: /cvmfs/singularity.galaxyproject.org/all/
type: cached_mulled_singularity
- auto_install: true
type: mulled_singularity
- auto_install: false
type: build_mulled_singularity
# cache_directory: /cvmfs/singularity.galaxyproject.org/all/
- type: cached_mulled_singularity
cache_directory: /cvmfs/singularity.galaxyproject.org/all/
- type: mulled_singularity
auto_install: true
- type: build_mulled_singularity
auto_install: false
cache_directory: "{{ galaxy_mutable_data_dir }}/singularity/mulled"
# Data Library Directories
library_import_dir: "{{ csnt_library_import_dir }}"
Expand Down
5 changes: 3 additions & 2 deletions templates/galaxy/config/tpv_rules_meta.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ destinations:
# Ensuring a consistent collation environment is good for reproducibility.
LC_ALL: C
# The cache directory holds the docker containers that get converted
SINGULARITY_CACHEDIR: "/cvmfs/singularity.galaxyproject.org/all/"
SINGULARITY_CACHEDIR: "{{ galaxy_mutable_data_dir }}/singularity/cache"
# Singularity uses a temporary directory to build the squashfs filesystem
SINGULARITY_TMPDIR: "{{ galaxy_mutable_data_dir }}/tmp"
scheduling:
Expand Down Expand Up @@ -202,7 +202,8 @@ destinations:
TMPDIR: $SCRATCHDIR
TMP: $SCRATCHDIR
TEMP: $SCRATCHDIR
SINGULARITY_CACHEDIR: "/cvmfs/singularity.galaxyproject.org/all/"
APPTAINER_CACHEDIR: "/storage/{{ pulsar.nfs_home }}/home/{{ pulsar.user_name }}/.singularity/cache/"
SINGULARITY_CACHEDIR: "/storage/{{ pulsar.nfs_home }}/home/{{ pulsar.user_name }}/.singularity/cache/"
SINGULARITY_TMPDIR: $SCRATCHDIR
XDG_CACHE_HOME: $SCRATCHDIR
scheduling:
Expand Down