Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: bf4f43d96a4cf3bdf090d82822a688677600e3f2 https://github.com/galaxyproject/galaxy/commit/bf4f43d96a4cf3bdf090d82822a68... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/__init__.py M lib/galaxy/containers/docker.py M lib/galaxy/containers/docker_model.py M lib/galaxy/tools/deps/docker_util.py M lib/galaxy/visualization/plugins/interactive_environments.py Log Message: ----------- Rough implentation of the DockerAPIInterface. Commit: 2e9c25da28535c268467e9dc5dc982b067ed14bc https://github.com/galaxyproject/galaxy/commit/2e9c25da28535c268467e9dc5dc98... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/__init__.py M lib/galaxy/containers/docker.py M lib/galaxy/visualization/plugins/interactive_environments.py Log Message: ----------- Create a general method for handling galaxy.containers param -> docker-py param mapping. Plus some cleanup. Commit: b7531593697175ad9c8f110e9943c9086c779ae4 https://github.com/galaxyproject/galaxy/commit/b7531593697175ad9c8f110e9943c... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker.py Log Message: ----------- Corrections to Docker spec handling Commit: ac9fce9a3c5e6995bafa5fbac602c2b2a4ccb003 https://github.com/galaxyproject/galaxy/commit/ac9fce9a3c5e6995bafa5fbac602c... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker_swarm.py Log Message: ----------- WIP Docker Swarm API interface Commit: 0bba56d106dbeedfac2c67226a749bf6354df4e2 https://github.com/galaxyproject/galaxy/commit/0bba56d106dbeedfac2c67226a749... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker.py Log Message: ----------- Docker API TLS support Commit: 26d265e0107143a62e7799ecf51ea85ac698696c https://github.com/galaxyproject/galaxy/commit/26d265e0107143a62e7799ecf51ea... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker_model.py M lib/galaxy/containers/docker_swarm.py Log Message: ----------- Docker service fixes Commit: c8ab4fae4db13b106dcd1dbc4f109cc66c305d8a https://github.com/galaxyproject/galaxy/commit/c8ab4fae4db13b106dcd1dbc4f109... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker.py M lib/galaxy/containers/docker_swarm.py Log Message: ----------- Enable setting defaults for docker API data structures. Commit: 360e43095a5036c8cedd452a5809160780f361a8 https://github.com/galaxyproject/galaxy/commit/360e43095a5036c8cedd452a58091... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker_model.py M lib/galaxy/containers/docker_swarm.py Log Message: ----------- Docker swarm interface for the API Commit: 0e357ca73729f67f27a31b83a7df6c5c74c43c99 https://github.com/galaxyproject/galaxy/commit/0e357ca73729f67f27a31b83a7df6... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/__init__.py M lib/galaxy/containers/docker.py M lib/galaxy/containers/docker_model.py M lib/galaxy/containers/docker_swarm.py M lib/galaxy/containers/docker_swarm_manager.py Log Message: ----------- Lint fixes Commit: 2794a650f5cd885f684d79e5124e349ccdf09879 https://github.com/galaxyproject/galaxy/commit/2794a650f5cd885f684d79e5124e3... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker_model.py M lib/galaxy/containers/docker_swarm.py M lib/galaxy/containers/docker_swarm_manager.py Log Message: ----------- Fixes for swarm manager. Commit: 806703a5e2ac679bcac496bb9acd36a9b248ce48 https://github.com/galaxyproject/galaxy/commit/806703a5e2ac679bcac496bb9acd3... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/__init__.py M lib/galaxy/containers/docker_model.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/docker_util.py M lib/galaxy/visualization/plugins/interactive_environments.py Log Message: ----------- Move DockerVolume to containers lib model and fix bugs. Commit: 9cd589508d260a8e04191701aa86e98548e97def https://github.com/galaxyproject/galaxy/commit/9cd589508d260a8e04191701aa86e... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker_model.py M lib/galaxy/containers/docker_swarm_manager.py M lib/galaxy/util/__init__.py Log Message: ----------- More detailed swarm manager state logging Commit: 605a156d618b352c0755af0b3e6e9e0922c126f8 https://github.com/galaxyproject/galaxy/commit/605a156d618b352c0755af0b3e6e9... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker_model.py M lib/galaxy/containers/docker_swarm_manager.py Log Message: ----------- Attempt to handle "phantom" docker tasks Commit: 0d90235b1c5e6742bc65f270c5ac0e19b48ee1d0 https://github.com/galaxyproject/galaxy/commit/0d90235b1c5e6742bc65f270c5ac0... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker_model.py M lib/galaxy/containers/docker_swarm.py Log Message: ----------- Fix lint/unit test errors Commit: 9de17e248feb2fa39e3a026727df75a5f42b7c59 https://github.com/galaxyproject/galaxy/commit/9de17e248feb2fa39e3a026727df7... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker.py M lib/galaxy/containers/docker_swarm.py Log Message: ----------- Add some error handling to the Docker API interface Commit: 507fed9e3c2e2ea6a7fc9938400c7642701bc3ad https://github.com/galaxyproject/galaxy/commit/507fed9e3c2e2ea6a7fc9938400c7... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker.py Log Message: ----------- Fix lint error Commit: 10e0314e8fe8d378fdeb97bfa0b3466e95e35f07 https://github.com/galaxyproject/galaxy/commit/10e0314e8fe8d378fdeb97bfa0b34... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/__init__.py M lib/galaxy/containers/docker.py M lib/galaxy/containers/docker_swarm.py M lib/galaxy/util/json.py Log Message: ----------- Move json format function to galaxy.util.json Commit: 8369d88295554639926ad5ddac445a20e449a0e4 https://github.com/galaxyproject/galaxy/commit/8369d88295554639926ad5ddac445... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt Log Message: ----------- Add conditional docker dependency for containers interface Commit: 5537ce1fa748422a27aea062165095cfba07c754 https://github.com/galaxyproject/galaxy/commit/5537ce1fa748422a27aea06216509... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker_model.py Log Message: ----------- Handle the case where a node claims a task exists but the tasks/services API disagrees Commit: 559fb9df9ba0379b975aaa2b5df7ac963c18f037 https://github.com/galaxyproject/galaxy/commit/559fb9df9ba0379b975aaa2b5df7a... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker.py M lib/galaxy/containers/docker_model.py M lib/galaxy/containers/docker_swarm.py Log Message: ----------- Allow docker client callers to pass in a test function that the client wrapper will call on certain types of expected failures. If the function returns a truthy value, it is returned instead. This is useful for state-altering changes where the request may have succeeded but the response failed. Commit: 9db3d23eaca5ce7270a9480038acd52f52951298 https://github.com/galaxyproject/galaxy/commit/9db3d23eaca5ce7270a9480038acd... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/__init__.py M lib/galaxy/containers/docker.py Log Message: ----------- Use consistent whitespace in containers lib classes Commit: c42d642233d962fc513c1039771acb00718d7348 https://github.com/galaxyproject/galaxy/commit/c42d642233d962fc513c1039771ac... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M config/containers_conf.yml.sample M lib/galaxy/containers/docker.py M lib/galaxy/containers/docker_swarm.py Log Message: ----------- Containers: - Improve documentation of docker API param mapping - Improve sample containers config file - Fix constraints - A couple other minor bug/logging fixes Commit: b205956b3882a4b1dbc0529742ba8f5aafddafe5 https://github.com/galaxyproject/galaxy/commit/b205956b3882a4b1dbc0529742ba8... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M lib/galaxy/containers/docker.py Log Message: ----------- Docker: Don't retry 4xx errors indefinitely. Possibly need to do this for more APIErrors. Commit: 9e2ada9a008addbfbcf1d764d80d216dca6978a0 https://github.com/galaxyproject/galaxy/commit/9e2ada9a008addbfbcf1d764d80d2... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-09 (Mon, 09 Apr 2018) Changed paths: M lib/galaxy/containers/docker.py Log Message: ----------- Infinite loop retry is probably bad. This should help with surviving transient errors. Commit: ca7b3fd59355df39304d37972f46940e88f1a975 https://github.com/galaxyproject/galaxy/commit/ca7b3fd59355df39304d37972f469... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-09 (Mon, 09 Apr 2018) Changed paths: M lib/galaxy/containers/docker_swarm.py Log Message: ----------- Fix tests due to missing name in mock module Commit: 91a25d0a08b969c9d6b7161fae6f34eff1c66f59 https://github.com/galaxyproject/galaxy/commit/91a25d0a08b969c9d6b7161fae6f3... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-10 (Tue, 10 Apr 2018) Changed paths: M config/containers_conf.yml.sample M lib/galaxy/containers/docker.py Log Message: ----------- Support manager failover for Docker Swarm mode Commit: 5127fd29570171f55d41e7458a5e2d7cec9a9837 https://github.com/galaxyproject/galaxy/commit/5127fd29570171f55d41e7458a5e2... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-10 (Tue, 10 Apr 2018) Changed paths: M lib/galaxy/containers/docker_model.py M lib/galaxy/containers/docker_swarm_manager.py Log Message: ----------- Swarm manager: log services that do not have tasks on any node. Commit: e651b34156a3af022bac250464d92ca6394c3d85 https://github.com/galaxyproject/galaxy/commit/e651b34156a3af022bac250464d92... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-12 (Thu, 12 Apr 2018) Changed paths: M lib/galaxy/containers/docker_swarm.py R lib/galaxy/containers/docker_swarm_manager.py A scripts/docker_swarm_manager.py Log Message: ----------- Remove swarm manager from lib Commit: d3038f859a03ad4b29eb6143ea9d88f915cfaac2 https://github.com/galaxyproject/galaxy/commit/d3038f859a03ad4b29eb6143ea9d8... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-13 (Fri, 13 Apr 2018) Changed paths: M lib/galaxy/app.py M lib/galaxy/visualization/plugins/interactive_environments.py M lib/galaxy/webapps/galaxy/controllers/interactive_environments.py Log Message: ----------- Load containers interface on app load if enable_beta_containers_interface is set. Commit: 860aaf8241759f915501dba221a49b80a18a4e3e https://github.com/galaxyproject/galaxy/commit/860aaf8241759f915501dba221a49... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-13 (Fri, 13 Apr 2018) Changed paths: M lib/galaxy/containers/docker.py Log Message: ----------- Fix docker interface failover by making the docker.APIClient wrapper use class vars, since we only ever want callers to use one APIClient. Commit: 564f7ecafe61d0c890cb9cde58640ce221935067 https://github.com/galaxyproject/galaxy/commit/564f7ecafe61d0c890cb9cde58640... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-13 (Fri, 13 Apr 2018) Changed paths: M scripts/docker_swarm_manager.py Log Message: ----------- Make the swarm manager recover on uncaught exceptions. It should do a better job of catching them in the application, but this is good enough for the moment. Commit: feb3e9ddf039e56f972149e7338138fb662745b4 https://github.com/galaxyproject/galaxy/commit/feb3e9ddf039e56f972149e733813... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-13 (Fri, 13 Apr 2018) Changed paths: M lib/galaxy/visualization/plugins/interactive_environments.py Log Message: ----------- Fix lint error Commit: 921fde4b8cdce2ab32846ba473846f1388b0592a https://github.com/galaxyproject/galaxy/commit/921fde4b8cdce2ab32846ba473846... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-18 (Wed, 18 Apr 2018) Changed paths: M config/containers_conf.yml.sample M lib/galaxy/app.py M lib/galaxy/containers/__init__.py M lib/galaxy/containers/docker.py M lib/galaxy/containers/docker_model.py M lib/galaxy/containers/docker_swarm.py R lib/galaxy/containers/docker_swarm_manager.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/docker_util.py M lib/galaxy/util/__init__.py M lib/galaxy/util/json.py M lib/galaxy/visualization/plugins/interactive_environments.py M lib/galaxy/webapps/galaxy/controllers/interactive_environments.py A scripts/docker_swarm_manager.py Log Message: ----------- Merge pull request #5861 from natefoo/containers-docker-lib Implement the API version of the Docker containers interface Compare: https://github.com/galaxyproject/galaxy/compare/881dc3601823...921fde4b8cdc