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 branch 'release_19.05' into dev

Browse Source
This commit is contained in:
Nicola Soranzo
2019-07-20 01:33:10 +01:00
parent 614a4ee0a2 868d3bd103
commit e565ef043c
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/source/admin/apache.md
+1 -1
View File
@@ -228,7 +228,7 @@ previous section:
```yaml
uwsgi:
#...
socket: unix:///srv/galaxy/var/uwsgi.sock
socket: /srv/galaxy/var/uwsgi.sock
mount: /galaxy=galaxy.webapps.galaxy.buildapp:uwsgi_app()
manage-script-name: true
# `module` MUST NOT be set when `mount` is in use
doc/source/admin/nginx.md
+1 -1
View File
@@ -220,7 +220,7 @@ previous section:
```yaml
uwsgi:
#...
socket: unix:///srv/galaxy/var/uwsgi.sock
socket: /srv/galaxy/var/uwsgi.sock
mount: /galaxy=galaxy.webapps.galaxy.buildapp:uwsgi_app()
manage-script-name: true
# `module` MUST NOT be set when `mount` is in use
lib/galaxy/tools/__init__.py
+4
View File
@@ -699,6 +699,10 @@ class Tool(Dictifiable):
self.home_target = home_target
self.tmp_target = tmp_target
self.docker_env_pass_through = tool_source.parse_docker_env_pass_through()
if self.environment_variables:
if not self.docker_env_pass_through:
self.docker_env_pass_through = []
self.docker_env_pass_through.extend(map(lambda x: x['name'], self.environment_variables))
# Parameters used to build URL for redirection to external app
redirect_url_params = tool_source.parse_redirect_url_params_elem()