Container to container resolver XML file to YAML #868
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kysrpex
requested changes
Aug 22, 2023
| @@ -415,7 +415,7 @@ galaxy_config_templates: | |||
| dest: "{{ galaxy_server_dir }}/lib/galaxy/tools/toolbox/filters/global_host_filters.py" | |||
| - src: "{{ galaxy_config_template_src_dir }}/config/job_conf.yml.j2" | |||
| dest: "{{ galaxy_config_dir }}/job_conf.yml" | |||
| - src: "{{ galaxy_config_template_src_dir }}/config/container_resolvers_conf.xml.j2" | |||
| - src: "{{ galaxy_config_template_src_dir }}/config/container_resolvers_conf.yml.j2" | |||
| dest: "{{ galaxy_config_dir }}/container_resolvers_conf.xml" | |||
There was a problem hiding this comment.
Suggested change
| dest: "{{ galaxy_config_dir }}/container_resolvers_conf.xml" | |
| dest: "{{ galaxy_config_dir }}/container_resolvers_conf.yml" |
| @@ -451,7 +451,7 @@ galaxy_config_templates: | |||
| dest: "{{ galaxy_server_dir }}/lib/galaxy/tool_util/toolbox/filters/global_host_filters.py" | |||
| - src: "{{ galaxy_config_template_src_dir }}/config/job_conf.yml.j2" | |||
| dest: "{{ galaxy_config_dir }}/job_conf.yml" | |||
| - src: "{{ galaxy_config_template_src_dir }}/config/container_resolvers_conf.xml.j2" | |||
| - src: "{{ galaxy_config_template_src_dir }}/config/container_resolvers_conf.yml.j2" | |||
| dest: "{{ galaxy_config_dir }}/container_resolvers_conf.xml" | |||
There was a problem hiding this comment.
Suggested change
| dest: "{{ galaxy_config_dir }}/container_resolvers_conf.xml" | |
| dest: "{{ galaxy_config_dir }}/container_resolvers_conf.yml" |
| # checks if the image file exists in `cache_directory` | ||
| - type: cached_mulled_singularity | ||
| #namespace: biocontainers | ||
| cache_directory: "/cvmfs/singularity.galaxyproject.org/all/" |
There was a problem hiding this comment.
Suggested change
| cache_directory: "/cvmfs/singularity.galaxyproject.org/all/" | |
| cache_directory: "{{ galaxy_singularity_images_cvmfs_path }}" |
| # | ||
| # If true return quay.io/NAMESPACE/MULLED_HASH otherwise to the cached image | ||
| # which is also quay.io/NAMESPACE/MULLED_HASH in case of docker | ||
| #auto_install: true |
There was a problem hiding this comment.
Suggested change
| #auto_install: true | |
| auto_install: true |
We have auto install explicitly set to true in the XML version of the file, although judging by the description, I don't even think it makes a difference.
| # and note the minor difference in the default for `cache_directory` | ||
| cache_directory: "/cvmfs/singularity.galaxyproject.org/all/" | ||
| #cache_directory_cacher_type: uncached | ||
|
|
There was a problem hiding this comment.
Suggested change
| auto_install: true | |
Same story as before, we have true in the XML version.
| @@ -0,0 +1,128 @@ | |||
| # Sample file for container resolvers. Resolvers that are potentially used by default | |||
There was a problem hiding this comment.
Suggested change
| # Sample file for container resolvers. Resolvers that are potentially used by default | |
| # Configuration file for container resolvers. Resolvers that are potentially used by default |
Just because the file is used in production now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.