Refactor toward support for running Galaxy in docker-galaxy-stable.#479
Merged
jmchilton merged 2 commits intogalaxyproject:masterfrom May 20, 2016
Merged
Conversation
2b8bf7b to
8be43ee
Compare
- General cleanup of planemo.galaxy.config docstrings and such. - Refactor the configured Galaxy properties into ones relevant for Docker and not. - Create an interface for the GalaxyConfig object to be very explicit about what the rest of planemo expects from it. - Reduce this interface - mainly involves refactoring startup command generation so pid_file doesn't need to be used outside the config module. - Implement a BaseGalaxyConfig for GalaxyConfig object functionality that will be shared with a future Docker impementation - and put the local instance specific stuff in a LocalGalaxyConfig object.
8be43ee to
8121af5
Compare
- Tell Galaxy that the webapp's server_name is ``main`` regardless - so that handler's can have fixed ``job_conf.xml`` files. - Provide a ``job_conf.xml`` if it isn't specified some other way. This prevents ``galaxy_root`` configuration (this should fix galaxyproject/planemo-machine#61). - Add Docker options to Galaxy target commands so job_conf.xml can be configured with Docker options appropriately - enable docker for Galaxy tools with ``--docker``.
8121af5 to
c4dfd55
Compare
This file contains hidden or 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
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.
xref #15