Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 484578936bc7ee04c6b28cb848772a4b6ded2b03 https://github.com/galaxyproject/galaxy/commit/484578936bc7ee04c6b28cb848772... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/templates/ipython.mako M config/plugins/interactive_environments/rstudio/templates/rstudio.mako M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Refactor to use -P This is a major refactoring to use the -P option of docker which should simplify some of our deployment like running docker containers on another host. In support of #372 Commit: 04c5e6864cc77fa1952d1acd88bac5df93f5ac44 https://github.com/galaxyproject/galaxy/commit/04c5e6864cc77fa1952d1acd88bac... 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: ----------- Merge branch 'gie-docker-cmd' into gie-docker-launch Commit: c9e9c95514e50f9a260b5ed342a715d2846fd4fe https://github.com/galaxyproject/galaxy/commit/c9e9c95514e50f9a260b5ed342a71... 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 small logic bugs, add logging Commit: a02df53f3356a03f3784070a4c50accfbc00187f https://github.com/galaxyproject/galaxy/commit/a02df53f3356a03f3784070a4c50a... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/templates/ipython.mako Log Message: ----------- Correct IPython notebooks to new URL Commit: a5b296b8ecd262d58a17049f5a9aeeecb7649621 https://github.com/galaxyproject/galaxy/commit/a5b296b8ecd262d58a17049f5a9ae... 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: ----------- Include user email Fixes bgruening/docker-ipython-notebook#51 Commit: a76ba39321e71cab8a0ecd3a610bcd861827815c https://github.com/galaxyproject/galaxy/commit/a76ba39321e71cab8a0ecd3a610bc... 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: ----------- Update against gie-docker-cmd Commit: 06a67c8c109dcf59425b53b80dcb5419f5e814af https://github.com/galaxyproject/galaxy/commit/06a67c8c109dcf59425b53b80dcb5... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/web/proxy/__init__.py Log Message: ----------- Add dynamic_proxy_prefix configuration Normally the proxy binds to :8800 and runs containers under :8800/ipython/... which is great... until you have an upstream proxy like apache wrapping that at the url FQDN/ipython and suddenly your cookies aren't available because they're specific to /galaxy. Thus, when an upstream proxy is in use, we correct the proxy's path to: with :8800/{cookie_path}/gie_proxy/ipython/... which behaves much more nicely with upstraem proxies. Commit: 5a2b1ec322f0808ba4e7925effe87a467f6b467a https://github.com/galaxyproject/galaxy/commit/5a2b1ec322f0808ba4e7925effe87... 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 branch 'gie-docker-cmd' into gie-docker-launch Commit: 1d78033625259bc50413393422feab38116b8884 https://github.com/galaxyproject/galaxy/commit/1d78033625259bc50413393422fea... 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: ----------- Merge branch 'gie-docker-cmd' into gie-docker-launch Commit: b4bbd1c2f161959fabdb62962aa63fb630c1ca2d https://github.com/galaxyproject/galaxy/commit/b4bbd1c2f161959fabdb62962aa63... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/templates/ipython.mako M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/proxy/__init__.py Log Message: ----------- Make use of proxy path in appropriate places Commit: 4a4a7ca51b195ac9d9a718448d65c89c02ae118c https://github.com/galaxyproject/galaxy/commit/4a4a7ca51b195ac9d9a718448d65c... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/rstudio/templates/rstudio.mako Log Message: ----------- Update URLs for rstudio Commit: e8eb46b65d76a2b7645aa325e321d135df02e802 https://github.com/galaxyproject/galaxy/commit/e8eb46b65d76a2b7645aa325e321d... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-09-24 (Thu, 24 Sep 2015) Changed paths: M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Use a backport for check_output that is not part of python 2.6 Commit: d4d439f51ebd2343e111d912499f336778e590c5 https://github.com/galaxyproject/galaxy/commit/d4d439f51ebd2343e111d912499f3... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-24 (Thu, 24 Sep 2015) Changed paths: M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Merge pull request #10 from erasche/check_output_backport Use a backport for check_output that is not part of python 2.6 Commit: 5f15b0d94c4a9703315f96fe3ce63b9b3906ea84 https://github.com/galaxyproject/galaxy/commit/5f15b0d94c4a9703315f96fe3ce63... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-24 (Thu, 24 Sep 2015) Changed paths: M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Replace backported one with just the code used Sorry bjoern, ripped out what you'd added and just used the code because the doctest was failing for some unknown reason and we didn't ever need to reuse the function, so ... easier this way Commit: 6d3ea7ee0086707bbf3f6d54cfa0ee1e2221341c https://github.com/galaxyproject/galaxy/commit/6d3ea7ee0086707bbf3f6d54cfa0e... Author: John Chilton <jmchilton@gmail.com> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M config/galaxy.ini.sample M config/plugins/interactive_environments/ipython/templates/ipython.mako M config/plugins/interactive_environments/rstudio/templates/rstudio.mako M lib/galaxy/config.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/proxy/__init__.py Log Message: ----------- Merge pull request #790 from erasche/gie-docker-launch Refactor GIE Launching to use -P Compare: https://github.com/galaxyproject/galaxy/compare/0fefff07b34c...6d3ea7ee0086