From 43b2b7929bd5940d14a59e4cb3cfe320a840f464 Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Wed, 17 Jun 2015 15:54:18 +0200 Subject: [PATCH] change docker_host to docker_hostname to be more explicit --- .../ipython/config/ipython.ini.sample | 2 +- lib/galaxy/web/base/interactive_environments.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/plugins/interactive_environments/ipython/config/ipython.ini.sample b/config/plugins/interactive_environments/ipython/config/ipython.ini.sample index 48e55de8198..ca488a1d594 100644 --- a/config/plugins/interactive_environments/ipython/config/ipython.ini.sample +++ b/config/plugins/interactive_environments/ipython/config/ipython.ini.sample @@ -24,4 +24,4 @@ command_inject = --sig-proxy=true -e DEBUG=false # The Docker hostname. It can be useful to run the Docker daemon on a different # host than Galaxy. -#docker_host = localhost +#docker_hostname = localhost diff --git a/lib/galaxy/web/base/interactive_environments.py b/lib/galaxy/web/base/interactive_environments.py index 82714edcfae..4a34d91ec4b 100644 --- a/lib/galaxy/web/base/interactive_environments.py +++ b/lib/galaxy/web/base/interactive_environments.py @@ -38,8 +38,9 @@ class InteractiveEnviornmentRequest(object): self.attr.HOST = trans.request.host.rsplit(':', 1)[0] self.load_deploy_config() + self.attr.docker_hostname = self.attr.viz_config.get("docker", "docker_hostname") self.attr.proxy_request = trans.app.proxy_manager.setup_proxy( - trans, host=self.attr.viz_config.get("docker", "docker_host") + trans, host=self.attr.docker_hostname ) self.attr.proxy_url = self.attr.proxy_request[ 'proxy_url' ] self.attr.PORT = self.attr.proxy_request[ 'proxied_port' ] @@ -57,7 +58,7 @@ class InteractiveEnviornmentRequest(object): # .get() that will ignore missing sections, so we must make use of # their defaults dictionary instead. default_dict['command_inject'] = '--sig-proxy=true' - default_dict['docker_host'] = 'localhost' + default_dict['docker_hostname'] = 'localhost' viz_config = ConfigParser.SafeConfigParser(default_dict) conf_path = os.path.join( self.attr.our_config_dir, self.attr.viz_id + ".ini" ) if not os.path.exists( conf_path ):