diff --git a/config/plugins/interactive_environments/ipython/config/ipython.ini.sample b/config/plugins/interactive_environments/ipython/config/ipython.ini.sample index 154f5a54e12..f75400fbfc2 100644 --- a/config/plugins/interactive_environments/ipython/config/ipython.ini.sample +++ b/config/plugins/interactive_environments/ipython/config/ipython.ini.sample @@ -7,9 +7,16 @@ #ssl = False [docker] + +# Command to execute docker. For example `sudo docker` or `docker-lxc`. command = docker + +# The docker image name that should be started. image = bgruening/docker-ipython-notebook +# Additional arguments that are passed to the `docker run` command. +command_inject = --sig-proxy=true + # URL to access the Galaxy API with from the spawn Docker containter, if empty # this falls back to galaxy.ini's galaxy_infrastructure_url and finally to the # Docker host of the spawned container if that is also not set. diff --git a/lib/galaxy/web/base/interactive_environments.py b/lib/galaxy/web/base/interactive_environments.py index 041f6b0ee8b..19465cf31e0 100644 --- a/lib/galaxy/web/base/interactive_environments.py +++ b/lib/galaxy/web/base/interactive_environments.py @@ -164,7 +164,8 @@ class InteractiveEnviornmentRequest(object): """ Generate and return the docker command to execute """ - 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")) + return '%s run -d %s -p %s:%s -v "%s:/import/" %s' % \ + (self.attr.viz_config.get("docker", "command"), + self.attr.viz_config.get("docker", "command_inject"), + self.attr.PORT, self.attr.docker_port, + temp_dir, self.attr.viz_config.get("docker", "image"))