Merge branch 'master' of github.com:nthiery/test-binder-sage

Author: nthiery

Dockerfile

@@ -8,12 +8,12 @@ ENV HOME /home/${NB_USER}
 # Make sure the contents of our repo are in ${HOME}
 COPY . ${HOME}
 USER root
-COPY jupyter /usr/bin/
+COPY jupyter jupyter-notebook /usr/bin/
 RUN chown -R ${NB_USER}:${NB_USER} ${HOME}
 USER ${NB_USER}
 
 # Upgrade to jupyter 5.* as required by mybinder
-RUN sage -pip install --upgrade notebook
+RUN sage -pip install "notebook>=5" "ipykernel>=4.6"
 
 # Install additional kernels
 RUN sage -i gap_jupyter

jupyter

@@ -1,2 +1,3 @@
 #!/bin/sh
-exec /usr/bin/sage -sh jupyter "$@"
+shift
+exec /usr/bin/sage -notebook jupyter "$@"

jupyter-notebook

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/sage -notebook jupyter "$@"