opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69 from jmchilton/ie_updates

Browse Source 
Small Interactive Environments Tweaks
This commit is contained in:
Dannon Baker
2015-04-02 09:13:33 -04:00
parent 368840ad25 543eb5b489
commit 43a94ada37
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/pep8_sources.txt
+1
View File
@@ -19,6 +19,7 @@ lib/galaxy/tools/toolbox
lib/galaxy/tools/{errors,loader_directory,test}.py
lib/galaxy/util/{__init__,json,permutations,plugin_config,properties,simplegraph,sockets,sleeper,streamball,submodules}.py
lib/galaxy/web/{proxy,security}
lib/galaxy/web/base/{__init__,interactive_environments}.py
lib/galaxy/web/formatting.py
lib/galaxy/webapps/__init__.py
lib/galaxy/webapps/galaxy/__init__.py
config/plugins/interactive_environments/ipython/templates/ipython.mako
+1
View File
@@ -35,6 +35,7 @@ notebook_access_url = ie_request.url_template('${PROXY_URL}/ipython/${PORT}/note
notebook_login_url = ie_request.url_template('${PROXY_URL}/ipython/${PORT}/login?next=%2Fipython%2F${PORT}%2Ftree')
docker_cmd = ie_request.docker_cmd(temp_dir)
ie_request.log.info("Starting IPython docker container with command [%s]" % docker_cmd)
subprocess.call(docker_cmd, shell=True)
%>
<html>
lib/galaxy/web/base/interactive_environments.py
+6 -2
View File
@@ -11,6 +11,9 @@ eggs.require("PyYAML")
import yaml
from galaxy.managers import api_keys
import logging
log = logging.getLogger(__name__)
class InteractiveEnviornmentRequest(object):
@@ -18,6 +21,7 @@ class InteractiveEnviornmentRequest(object):
plugin_config = plugin.config
self.trans = trans
self.log = log
self.attr = Bunch()
self.attr.viz_id = plugin_config["name"].lower()
@@ -161,5 +165,5 @@ class InteractiveEnviornmentRequest(object):
"""
return '%s run -d -u %s --sig-proxy=true -p %s:%s -v "%s:/import/" %s' % \
(self.attr.viz_config.get("docker", "command"), os.geteuid(),
self.attr.PORT, self.attr.docker_port,
temp_dir, self.attr.viz_config.get("docker", "image"))
self.attr.PORT, self.attr.docker_port,
temp_dir, self.attr.viz_config.get("docker", "image"))