Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 29331b36cf4ad350d4919679deeca6f342b1e182 https://github.com/galaxyproject/galaxy/commit/29331b36cf4ad350d4919679deeca... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M .ci/flake8_docstrings_include_list.txt M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt A config/containers_conf.yml.sample M config/galaxy.ini.sample M lib/galaxy/config.py R lib/galaxy/container/__init__.py R lib/galaxy/container/docker_swarm.py A lib/galaxy/containers/__init__.py A lib/galaxy/containers/docker.py A lib/galaxy/containers/docker_decorators.py A lib/galaxy/containers/docker_model.py A lib/galaxy/containers/docker_swarm.py A lib/galaxy/containers/docker_swarm_manager.py M lib/galaxy/exceptions/__init__.py M lib/galaxy/util/submodules.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/webapps/galaxy/controllers/interactive_environments.py Log Message: ----------- Container interface abstraction. Support Docker and Docker Swarm mode (>1.12 SwarmKit). Container interface configuration is performed via the containers_conf.yml config file, for which a documented sample is provided. The GIE launcher has been modified to use the container interface if the `enable_beta_containers_interface` option is set in galaxy.ini. This removes some of the previous GIE-specific swarm mode work that was done. The Galaxy docker swarm manager also uses the container interface now. TODO: The API docker interfaces should be done fairly soon before we have many consumers of the docker model objects, because they'll probably be changed to more closely reflect their API representations. Commit: 695293f01563f56637ee6b63db2c96bfd0204f9f https://github.com/galaxyproject/galaxy/commit/695293f01563f56637ee6b63db2c9... Author: John Chilton <jmchilton@gmail.com> Date: 2017-04-13 (Thu, 13 Apr 2017) Changed paths: M .ci/flake8_docstrings_include_list.txt M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt A config/containers_conf.yml.sample M config/galaxy.ini.sample M lib/galaxy/config.py R lib/galaxy/container/__init__.py R lib/galaxy/container/docker_swarm.py A lib/galaxy/containers/__init__.py A lib/galaxy/containers/docker.py A lib/galaxy/containers/docker_decorators.py A lib/galaxy/containers/docker_model.py A lib/galaxy/containers/docker_swarm.py A lib/galaxy/containers/docker_swarm_manager.py M lib/galaxy/exceptions/__init__.py M lib/galaxy/util/submodules.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/webapps/galaxy/controllers/interactive_environments.py Log Message: ----------- Merge pull request #3863 from natefoo/containers-abstraction Container interface abstraction Compare: https://github.com/galaxyproject/galaxy/compare/040635d3dcee...695293f01563