* fix mpi notebook initialisation (i hope!)

* add environ variable to enable xvfb gluc
underworldcode · Jun 3, 2016 · 68dc796 · 68dc796
1 parent de958f2
commit 68dc796
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/docs/development/docker/base/Dockerfile b/docs/development/docker/base/Dockerfile
@@ -58,10 +58,13 @@ RUN mkdir -p -m 700 /root/.jupyter/ && \
     echo "c.NotebookApp.ip = '*'" >> /root/.jupyter/jupyter_notebook_config.py
 
 # Setup ipyparallel for mpi profile
+WORKDIR /root/.jupyter
 RUN ipcluster nbextension enable && \ 
     ipython profile create --parallel --profile=mpi && \
     echo "c.IPClusterEngines.engine_launcher_class = 'MPIEngineSetLauncher'" >> /root/.ipython/profile_mpi/ipcluster_config.py
 
+WORKDIR /
+
 # expose notebook port
 EXPOSE 8888
 

diff --git a/glucifer/__init__.py b/glucifer/__init__.py
@@ -48,3 +48,8 @@ def stop_virtual_display():
     global _display
     if not _display is None:
         _display.stop()
+
+import os as _os
+# disable collection of data if requested
+if "GLUCIFER_USE_XVFB" in _os.environ:
+    start_virtual_display()