Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 52dfd589b986397852d6700a4ca8d8afa7235416 https://github.com/galaxyproject/galaxy/commit/52dfd589b986397852d6700a4ca8d... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Unify the docker command, command_inject, and command_wrapper Commit: 56ac2c0f137523c320ca12c684579b75d4b76dfc https://github.com/galaxyproject/galaxy/commit/56ac2c0f137523c320ca12c684579... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Revert command inject and document rationale Commit: 175f89bdc8df1550d34bc5084df45185ef633057 https://github.com/galaxyproject/galaxy/commit/175f89bdc8df1550d34bc5084df45... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Hardcode defaults, per @jmchilton's comments Commit: 10af45012735603385ac076f7b517dfe70314484 https://github.com/galaxyproject/galaxy/commit/10af45012735603385ac076f7b517... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Move run into python from template Commit: d7bff96778b11a3ed2838103aea6cceca43bdfb4 https://github.com/galaxyproject/galaxy/commit/d7bff96778b11a3ed2838103aea6c... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Correct stupid mistake from lack of testing Commit: 1ad3308b49a6f5a25ef357300b47791987acbb22 https://github.com/galaxyproject/galaxy/commit/1ad3308b49a6f5a25ef357300b477... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample Log Message: ----------- Remove small formatting issue Commit: e8db8a1932ab058d83331b547d9ef6e6e49bb934 https://github.com/galaxyproject/galaxy/commit/e8db8a1932ab058d83331b547d9ef... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Add docker_galaxy_temp_dir This is useful for if the normal tmp dir is located on NFS. In this case it's useful to override the temporary directory with an sshfs mount for example. Commit: b1d642a6ecd324c6c519fb391f7747a05d709bb7 https://github.com/galaxyproject/galaxy/commit/b1d642a6ecd324c6c519fb391f774... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample Log Message: ----------- Update ipython.ini.sample Commit: a7c1c53f5352323abdb422fc8a9557e16e3f7993 https://github.com/galaxyproject/galaxy/commit/a7c1c53f5352323abdb422fc8a955... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample Log Message: ----------- Update rstudio.ini.sample Commit: 03ee295e7be09d53f7c1c3ff03988e0e82aa254d https://github.com/galaxyproject/galaxy/commit/03ee295e7be09d53f7c1c3ff03988... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Merge pull request #9 from erasche/docker_galaxy_temp_dir Add docker_galaxy_temp_dir Commit: f0ea4be88477d1baf3d4793af3fa173ec431a418 https://github.com/galaxyproject/galaxy/commit/f0ea4be88477d1baf3d4793af3fa1... Author: John Chilton <jmchilton@gmail.com> Date: 2015-09-24 (Thu, 24 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Merge pull request #782 from erasche/gie-docker-cmd Unify the docker command, command_inject, and command_wrapper Compare: https://github.com/galaxyproject/galaxy/compare/cc1d7a509cf7...f0ea4be88477