Merge pull request #168 from parente/shutdown-on-quit

Shutdown kernels on interrupt
jupyter-server · Jun 15, 2016 · 46b2e21 · 46b2e21
2 parents f58594c + eee34a8
commit 46b2e21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,8 +1,9 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-FROM jupyter/pyspark-notebook:9f4ed032bada
-RUN pip install nose traitlets==4.2.0
+FROM jupyter/pyspark-notebook:8015c88c4b11
+RUN conda install -y nose && \
+    conda install -y -n python2 nose
 
 # Setup a sphinx environment for doc building
 COPY docs/environment.yml /tmp

diff --git a/kernel_gateway/gatewayapp.py b/kernel_gateway/gatewayapp.py
@@ -471,6 +471,8 @@ def start(self):
             self.io_loop.start()
         except KeyboardInterrupt:
             self.log.info("Interrupted...")
+        finally:
+            self.shutdown()
 
     def stop(self):
         """