Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 8d224edb5729114dd100fe730619d666df7e84dc https://github.com/galaxyproject/galaxy/commit/8d224edb5729114dd100fe730619d... Author: John Chilton <jmchilton@gmail.com> Date: 2017-06-12 (Mon, 12 Jun 2017) Changed paths: M lib/galaxy/config.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py Log Message: ----------- Allow Galaxy to use cached mulled containers for Singularity. - Change undocumented (and probably unused) config option container_image_cache_path default to "database/contianer_cache". - Update container resolver framework to let plugins assert they only produce containers of a single type. - Update mulled container resolvers to indicate they produce Docker containers only - update names also. - Refactor mulled caching stuff to allow reuse with Singularity (where the names come from is different - but a lot of the logic is the same). - Add a cached singularity container resolver - that searches "config.container_image_cache_path/singularity/mulled" for an image with the correct name. Next up - similarly refactor the BuildMulledDockerContainerResolver to allow reuse and implement the BuildMulledSingularityContainerResolver. Commit: 49046336dce63c721077c779f832bf43fa020461 https://github.com/galaxyproject/galaxy/commit/49046336dce63c721077c779f832b... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-06-12 (Mon, 12 Jun 2017) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py Log Message: ----------- fix CachedMulledSingularityContainerResolver Commit: d8c6838f21817690ed4a06b26cd64d7c39a990a3 https://github.com/galaxyproject/galaxy/commit/d8c6838f21817690ed4a06b26cd64... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-06-12 (Mon, 12 Jun 2017) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py Log Message: ----------- pep8 fixes Commit: 3e36af050ff1b1e94dbae4a46607038bb16fd553 https://github.com/galaxyproject/galaxy/commit/3e36af050ff1b1e94dbae4a466070... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-06-12 (Mon, 12 Jun 2017) Changed paths: M lib/galaxy/config.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py Log Message: ----------- Merge pull request #4179 from jmchilton/singularity_mulled_cached Allow Galaxy to use cached mulled containers for Singularity. Compare: https://github.com/galaxyproject/galaxy/compare/f81c5bb1d957...3e36af050ff1