Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 10ef0a3b00681dbab09119cc057a3ebe47e3d4f9 https://github.com/galaxyproject/galaxy/commit/10ef0a3b00681dbab09119cc057a3... Author: Bjoern Gruening <bjoern.gruening@gmail.com> Date: 2016-04-30 (Sat, 30 Apr 2016) Changed paths: M config/job_conf.xml.sample_advanced Log Message: ----------- HTCondor and Docker documentation Commit: ba409e75181224c80f0acf02530cac31fe28461c https://github.com/galaxyproject/galaxy/commit/ba409e75181224c80f0acf02530ca... Author: Bjoern Gruening <bjoern.gruening@gmail.com> Date: 2016-04-30 (Sat, 30 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/condor.py Log Message: ----------- enable HTCondor Docker integration Commit: 3ab43e38f5b2d63c300e99635234051956905f94 https://github.com/galaxyproject/galaxy/commit/3ab43e38f5b2d63c300e996352340... Author: Bjoern Gruening <bjoern.gruening@gmail.com> Date: 2016-04-30 (Sat, 30 Apr 2016) Changed paths: M test/functional/tools/catDocker.xml Log Message: ----------- add new Docker Image. We need to have bash inside of Docker. Commit: ead96a55a9d05602a7b241d2d8b8acf557ce9425 https://github.com/galaxyproject/galaxy/commit/ead96a55a9d05602a7b241d2d8b8a... Author: Bjoern Gruening <bjoern.gruening@gmail.com> Date: 2016-05-01 (Sun, 01 May 2016) Changed paths: M lib/galaxy/jobs/__init__.py Log Message: ----------- Add the ability to set the default handler and destination via environment variables. Commit: 7bd595b8f1caf4ea5085a41ba8129653d48f83a7 https://github.com/galaxyproject/galaxy/commit/7bd595b8f1caf4ea5085a41ba8129... Author: Bjoern Gruening <bjoern.gruening@gmail.com> Date: 2016-05-02 (Mon, 02 May 2016) Changed paths: M test/functional/tools/catDocker.xml Log Message: ----------- Revert "add new Docker Image. We need to have bash inside of Docker." This reverts commit 3ab43e38f5b2d63c300e99635234051956905f94. Commit: 917c882255ff1261bb99bb4bfc8bd1e165e26b96 https://github.com/galaxyproject/galaxy/commit/917c882255ff1261bb99bb4bfc8bd... Author: John Chilton <jmchilton@gmail.com> Date: 2016-05-16 (Mon, 16 May 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/runners/condor.py M lib/galaxy/tools/deps/containers.py Log Message: ----------- Revise HTCondor Docker image resolution. Bring inline with the rest of the job runner's Docker image resolution stuff. Order of reosolution is: - Use destination specified override if found: docker_container_id_override - Use the tool specified container if not found and no override: see tool - Else - use docker_default_container_id. This adjusts the documentation to reflect this and make the the parameters more consistent throughout. I've modified this so docker_image (the old name introduced by the Docker Condor PR) still works - but I have left it undocumented intentionally for consistency. Commit: 8e6211aeb1bc3ffa696d61be89954d6e68215be4 https://github.com/galaxyproject/galaxy/commit/8e6211aeb1bc3ffa696d61be89954... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-05-17 (Tue, 17 May 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/runners/condor.py M lib/galaxy/tools/deps/containers.py Log Message: ----------- Merge pull request #10 from jmchilton/htcondor_docker Revise HTCondor Docker image resolution. Commit: c2ea4ee5266370ef1378df922af5a0c96d0f835c https://github.com/galaxyproject/galaxy/commit/c2ea4ee5266370ef1378df922af5a... Author: John Chilton <jmchilton@gmail.com> Date: 2016-05-17 (Tue, 17 May 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/runners/condor.py M lib/galaxy/tools/deps/containers.py Log Message: ----------- Merge pull request #2278 from bgruening/htcondor_docker HTCondor Docker Integration Compare: https://github.com/galaxyproject/galaxy/compare/6fc2ae42cd4f...c2ea4ee52663