Commit Graph
28296 Commits
Author SHA1 Message Date
Dannon Baker d779622138 Merge with current dev. 2017-06-14 10:40:02 -04:00
Dannon Baker a8251fe656 Remove .idea and .vscode from .gitignore (these are editor specific files that contributors can add to their personal global .gitignores) 2017-06-13 14:26:03 -04:00
Björn Grüning 3e36af050f Merge pull request #4179 from jmchilton/singularity_mulled_cached
Allow Galaxy to use cached mulled containers for Singularity.
2017-06-12 23:13:43 +02:00
Björn Grüning f81c5bb1d9 Merge pull request #4180 from jmchilton/singularity_volumes
Improve default handling of Singularity volumes.
2017-06-12 15:46:43 +02:00
Björn Grüning d8c6838f21 pep8 fixes 2017-06-12 15:02:20 +02:00
Björn Grüning 49046336dc fix CachedMulledSingularityContainerResolver 2017-06-12 08:33:26 -04:00
John Chilton 8d224edb57 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.
2017-06-12 08:33:26 -04:00
Dannon Baker d36c4053cd Merge and repack. 2017-06-12 07:29:55 -04:00
Dannon Baker 707c66a6ab Merge branch 'grid_datasets' into dev 2017-06-12 07:28:24 -04:00
Dannon Baker 2178cffaed Merge pull request #4173 from jmchilton/galaxy-lib-mulled-update
Improved Mulled Containers
2017-06-12 07:21:33 -04:00
Björn Grüning 74333164db pep fixes 2017-06-12 08:55:45 +02:00
John Chilton 55681f6e2a Improve default handling of Singularity volumes.
My understanding is that unlike Docker, Singularity doesn't allow a subdirectory to be mounted rw and its parent to be mounted ro - it will just be ro. This PR adjusts the default volume handling for Singularity to intelligently fallback to mounting parent directories as rw if their child directories are listed as being mounted rw.

Ping @bgruening - is the above a description correct and does this approach work for you?
2017-06-11 22:09:42 -04:00
Björn Grüning 3bff7f36d1 Merge pull request #4175 from jmchilton/singularity
Implement Singularity Support
2017-06-10 22:51:33 +02:00
John Chilton 065eb716c4 Merged downstream galaxy-lib mulled enhancement and fixes.
- Singularity support for building mulled containers https://github.com/galaxyproject/galaxy-lib/pull/64
- Hack to fix previous mulled v2 changes for single requirement tools https://github.com/galaxyproject/galaxy-lib/pull/65.
2017-06-10 05:55:51 -04:00
John Chilton 413f476520 Implement singularity support.
See http://singularity.lbl.gov/ for more information on Singularity and see job_conf.xml.sample_advanced for information on setting up job runners to exploit singularity.

The biggest current caveat is probably that currently these container images need to be setup manually by the admin and the paths hard-coded for each tool in job_conf.xml. There are people who do such manual setups for Docker (https://github.com/phnmnl/container-galaxy-k8s-runtime/blob/develop/config/job_conf.xml) - so it wouldn't be surprising if someone wanted to set this up for singularity as well. That said I'm sure this will be followed up by magic to fetch and convert Docker containers and leverage published singularity containers (such as mulled can now produce (https://github.com/galaxyproject/galaxy-lib/pull/64).
2017-06-09 16:55:03 -04:00
John Chilton 51219f0db0 Add a test tool for mulled containers with versionless requirements. 2017-06-08 15:42:28 -04:00
John Chilton ec34287afd Bring in all recent mulled container changes from galaxy-lib.
- Update mulled container resolution to use a version 2 (v2) hashing function. https://github.com/galaxyproject/galaxy-lib/pull/63
- When building images with mulled, always cleanup build directory. https://github.com/galaxyproject/galaxy-lib/pull/55/files and https://github.com/galaxyproject/galaxy-lib/pull/61
- Expose an offline search option in library Conda search utility. https://github.com/galaxyproject/galaxy-lib/pull/60
- Fix first use of mulled-build-* for auto-install of Involucro. https://github.com/galaxyproject/galaxy-lib/pull/59/commits/c5e7778f51d735a8bb6a4a955a0768e65bfb0548
- Fix up and improve logic related to rebuilding mulled containers. https://github.com/galaxyproject/galaxy-lib/pull/59/commits/faf528997c36f8a9a00566549ab2bcb07e93a9d7
- Fix mulled-build-files to properly handle tab separated files. https://github.com/galaxyproject/galaxy-lib/pull/59/commits/10b1cf3addf03e1e442c2d1617c7468de67b2cac
- Various other mulled-build-file enhancements. https://github.com/galaxyproject/galaxy-lib/pull/59/commits/70314e3e65921a544f2188eb2a16f8e7394ff1b7 https://github.com/galaxyproject/galaxy-lib/pull/59/commits/21b4bc58013dc53509f02d027afa73396a15aabd https://github.com/galaxyproject/galaxy-lib/pull/59/commits/74abe8a107044e106e14c244d03b030e0ed5d43d https://github.com/galaxyproject/galaxy-lib/pull/58
- Correct mulled-search default namespace from mulled to biocontainers. https://github.com/galaxyproject/galaxy-lib/pull/57
- Add ability to specify a new base image when building mulled images. https://github.com/galaxyproject/galaxy-lib/pull/56
- Update the default mulled target namespace from the older mulled to the new biocontainers.
2017-06-08 15:42:11 -04:00
guerler b25bf5946e Merge branch 'dev' into grid_datasets 2017-06-08 11:59:51 -04:00
Dannon Baker 625feb1bb6 Merge pull request #4157 from guerler/grid_pages
Remove saved pages grid mako
2017-06-08 08:07:44 -04:00
Dannon Baker 848bcd8587 Merge pull request #4137 from gregvonkuster/ptformats4
Move PlantTribes datatypes to a separate file with enhancements and fixes
2017-06-08 07:58:00 -04:00
Martin Cech 2b3cd15c77 Merge pull request #4164 from jmchilton/gei_desc_update
Fix older GIE config sample description.
2017-06-07 15:33:06 -04:00
guerler e3109d8d94 Merge branch 'dev' into grid_pages 2017-06-07 13:30:54 -04:00
guerler aedb72606a Add packed files 2017-06-07 13:27:48 -04:00
guerler a5d99ce516 Remove custom grid mako name from grid definition 2017-06-07 12:49:13 -04:00
John Chilton 3249042385 Fix older GIE config sample description. 2017-06-07 10:46:39 -04:00
guerler 8aa23f0479 Add note on missing highlighting handling 2017-06-07 09:20:20 -04:00
guerler b0fb99c080 Add refresh handling 2017-06-07 09:18:29 -04:00
guerler 14345a4232 Remove mako file 2017-06-07 09:05:48 -04:00
guerler 2bbe5e0498 Fix router url, pack scripts 2017-06-07 09:03:40 -04:00
guerler eea8841f53 Fix grid element target 2017-06-07 08:55:39 -04:00
guerler a26ee06cf9 Add client endpoint to backend 2017-06-07 08:53:22 -04:00
guerler 5421dbd606 Transform controller endpoint to dictionary mode 2017-06-07 08:52:56 -04:00
guerler 04775ab4d8 Redirect menu link to new dataset grid endpoint 2017-06-07 08:50:39 -04:00
guerler e5010ad8ef Prepare backbone route for datasets endpoint 2017-06-07 08:49:35 -04:00
Dannon Baker d75cec1603 Merge pull request #4149 from guerler/slider_upgrade
Slider enhancement, shared event listeners
2017-06-07 07:55:24 -04:00
Martin Cech 865b2249ce Merge pull request #4160 from dannon/json_contenttype
Set content type to application/json for JSON text types.
2017-06-06 17:15:49 -04:00
Dannon Baker 0b1a335421 Set content type to application/json for JSON text types. 2017-06-06 16:41:37 -04:00
Björn Grüning ee4826fbc4 Merge pull request #4154 from jmchilton/dynamic_disable_runners
Add the ability to control job conf plugin loading from environment variables.
2017-06-06 22:07:55 +02:00
Dannon Baker ae76200b08 Merge remote-tracking branch 'upstream/release_17.05' into dev 2017-06-06 15:52:49 -04:00
Dannon Baker d39b955e8a Merge pull request #4158 from martenson/webhooks-fix-prefix
[17.05] fix webhooks loading url
2017-06-06 15:52:23 -04:00
Martin Cech 0b1eaf3269 fix - remove extra slash 2017-06-06 14:27:42 -04:00
John Chilton d14eb9e63c Add the ability to control job conf plugin loading from environment variables.
All job configuration parameters can be set using environment variables but currently the actual loading of the plugin cannot. This is problematic for setting up single job confs for multiple environemnts (like done with docker-galaxy-stable) when using plugins that may hang waiting for resources (such as Kubernetes for the K8 runner or a MQ for Pulsar for instance) or may require library dependencies not be setup in every environment the job configuration is deployed in.

xref https://github.com/bgruening/docker-galaxy-stable/pull/328

Rebased with advice from @bgruening.
2017-06-06 14:20:24 -04:00
guerler 5d85515c09 Fix sharing base mako urls for new client side controller endpoints 2017-06-06 13:04:16 -04:00
guerler 37bdf694d1 Redirect close in page editor to new client route 2017-06-06 12:56:45 -04:00
guerler 7f97d5016e Revise template 2017-06-06 12:55:20 -04:00
guerler 53cfedaaea Pack scripts 2017-06-06 12:51:15 -04:00
guerler 81592f3c32 Remove pages grid mako 2017-06-06 12:50:11 -04:00
guerler 26fdf8b8fd Display only link for shared pages since viewing is the only operation 2017-06-06 12:49:28 -04:00
guerler aa85d00615 Add shared pages table 2017-06-06 12:43:17 -04:00
Dannon Baker fae508b48f Merge pull request #4155 from jmchilton/tool_cache_move
Move galaxy.tools.toolbox.cache to galaxy.tools.cache.
2017-06-06 12:42:11 -04:00