Update and fix Jupyter on Test

galaxyproject · Nov 30, 2016 · 68e7fbd · 68e7fbd
1 parent bd4f3a0
commit 68e7fbd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/roles/galaxyprojectdotorg.interactive_environments/meta/.galaxy_install_info b/roles/galaxyprojectdotorg.interactive_environments/meta/.galaxy_install_info
@@ -1 +1 @@
-{install_date: 'Tue Nov 22 17:49:41 2016', version: 0.2.1}
+{install_date: 'Wed Nov 30 20:31:44 2016', version: 0.2.2.1}
diff --git a/roles/galaxyprojectdotorg.interactive_environments/templates/jupyter_apache.conf.j2 b/roles/galaxyprojectdotorg.interactive_environments/templates/jupyter_apache.conf.j2
@@ -7,7 +7,7 @@
 {% from '_prefix.j2' import prefix with context %}
 
 # IPython specific. Other IEs may require their own routes.
-ProxyPass        {{ prefix() }}/jupyter/api/kernels ws://localhost:{{ interactive_environments_proxy_port }}{{ prefix() }}/jupyter/api/kernels
+ProxyPass        {{ prefix() }}/jupyter/ipython/api/kernels ws://localhost:{{ interactive_environments_proxy_port }}{{ prefix() }}/jupyter/ipython/api/kernels
 
 # Global GIE configuration
 ProxyPass        {{ prefix() }} http://localhost:8800{{ prefix() }}

diff --git a/roles/galaxyprojectdotorg.interactive_environments/templates/jupyter_nginx.conf.j2 b/roles/galaxyprojectdotorg.interactive_environments/templates/jupyter_nginx.conf.j2
@@ -13,8 +13,8 @@ location {{ prefix() }}/jupyter {
 }
 
 # websocket for kernels
-location {{ prefix() }}/jupyter/api/kernels {
-    proxy_pass http://localhost:{{ interactive_environments_proxy_port }}{{ prefix() }}/jupyter/api/kernels;
+location ~ ^{{ prefix() }}/jupyter/(?<jupyter_plugin>.+?)/api/kernels {
+    proxy_pass http://localhost:{{ interactive_environments_proxy_port }}{{ prefix() }}/jupyter/$jupyter_plugin/api/kernels;
     proxy_redirect off;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;

diff --git a/stage/galaxy_version.yml b/stage/galaxy_version.yml
@@ -1,4 +1,4 @@
 ---
-galaxy_version: 16.10.dev
-galaxy_commit: 3ec7be27952b57cf7e0ad87fdf067cacc5e66856
-galaxy_commit_short: 3ec7be2
+galaxy_version: 17.01.dev
+galaxy_commit: 2d510fae981f0255f04b21272f99e995f0a16f0b
+galaxy_commit_short: 2d510fa
diff --git a/stage/group_vars/galaxyservers.yml b/stage/group_vars/galaxyservers.yml
@@ -145,6 +145,7 @@ interactive_environments_config_files:
     contents:
       docker:
         command: "docker -H tcp://iedocker.galaxyproject.org:2376 --tlsverify {docker_args}"
+        command_inject: "--memory=16g"
         galaxy_url: "https://test.galaxyproject.org"
         docker_hostname: "iedocker.galaxyproject.org"
   - ie_name: jupyter