Merge pull request #729 from parente/fix-builds

Fix builds by updating to compatible versions

.travis.yml

@@ -7,5 +7,6 @@ services:
 install:
     - make dev-env
 script:
+    - set -e
     - make test/docs docs
     - make build-test-all DARGS="--build-arg TEST_ONLY_BUILD=1"

all-spark-notebook/Dockerfile

@@ -34,7 +34,7 @@ RUN conda install --quiet --yes \
 
 # Apache Toree kernel
 RUN pip install --no-cache-dir \
-    https://dist.apache.org/repos/dist/dev/incubator/toree/0.2.0-incubating-rc5/toree-pip/toree-0.2.0.tar.gz \
+    https://dist.apache.org/repos/dist/dev/incubator/toree/0.3.0-incubating-rc1/toree-pip/toree-0.3.0.tar.gz \
     && \
     jupyter toree install --sys-prefix && \
     rm -rf /home/$NB_USER/.local && \

base-notebook/Dockerfile

@@ -87,7 +87,7 @@ RUN conda install --quiet --yes 'tini=0.18.0' && \
 # Do all this in a single RUN command to avoid duplicating all of the
 # files across image layers when the permissions change
 RUN conda install --quiet --yes \
-    'notebook=5.6.*' \
+    'notebook=5.7.*' \
     'jupyterhub=0.9.*' \
     'jupyterlab=0.34.*' && \
     conda clean -tipsy && \

docs/using/running.md

@@ -112,7 +112,7 @@ notebook
 
 ## Using Binder
 
-[Binder](https://mybinder.org/) is a service that allows you to create and share custom computing environments for projects in version control. You can use any of the Jupyter Docker Stacks images as a basis for a Binder-compatible Dockerfile. See the [docker-stacks example](https://mybinder.readthedocs.io/en/latest/sample_repos.html#using-a-docker-image-from-the-jupyter-docker-stacks-repository) and [Using a Dockerfile](https://mybinder.readthedocs.io/en/latest/dockerfile.html) sections in the [Binder documentation](https://mybinder.readthedocs.io/en/latest/index.html) for instructions.
+[Binder](https://mybinder.org/) is a service that allows you to create and share custom computing environments for projects in version control. You can use any of the Jupyter Docker Stacks images as a basis for a Binder-compatible Dockerfile. See the [docker-stacks example](https://mybinder.readthedocs.io/en/latest/sample_repos.html#using-a-docker-image-from-the-jupyter-docker-stacks-repository) and [Using a Dockerfile](https://mybinder.readthedocs.io/en/latest/tutorials/dockerfile.html) sections in the [Binder documentation](https://mybinder.readthedocs.io/en/latest/index.html) for instructions.
 
 ## Using JupyterHub
 
@@ -120,4 +120,4 @@ You can configure JupyterHub to launcher Docker containers from the Jupyter Dock
 
 ## Using Other Tools and Services
 
-You can use the Jupyter Docker Stacks with any Docker-compatible technology (e.g., [Docker Compose](https://docs.docker.com/compose/), [docker-py](https://github.com/docker/docker-py), your favorite cloud container service). See the documentation of the tool, library, or service for details about how to reference, configure, and launch containers from these images.
+You can use the Jupyter Docker Stacks with any Docker-compatible technology (e.g., [Docker Compose](https://docs.docker.com/compose/), [docker-py](https://github.com/docker/docker-py), your favorite cloud container service). See the documentation of the tool, library, or service for details about how to reference, configure, and launch containers from these images.
\ No newline at end of file

scipy-notebook/Dockerfile

@@ -34,7 +34,7 @@ RUN conda install --quiet --yes \
     'cloudpickle=0.5*' \
     'dill=0.2*' \
     'numba=0.38*' \
-    'bokeh=0.12*' \
+    'bokeh=0.13*' \
     'sqlalchemy=1.2*' \
     'hdf5=1.10*' \
     'h5py=2.7*' \
@@ -48,7 +48,8 @@ RUN conda install --quiet --yes \
     jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
     # Also activate ipywidgets extension for JupyterLab
     jupyter labextension install @jupyter-widgets/jupyterlab-manager@^0.37.0 && \
-    jupyter labextension install jupyterlab_bokeh@^0.6.0 && \
+    # Pin to 0.6.2 until we can move to Lab 0.35 (jupyterlab_bokeh didn't bump to 0.7.0)
+    jupyter labextension install jupyterlab_bokeh@0.6.2 && \
     npm cache clean --force && \
     rm -rf $CONDA_DIR/share/jupyter/lab/staging && \
     rm -rf /home/$NB_USER/.cache/yarn && \

tensorflow-notebook/Dockerfile

@@ -6,8 +6,8 @@ LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>"
 
 # Install Tensorflow
 RUN conda install --quiet --yes \
-    'tensorflow=1.5*' \
-    'keras=2.1*' && \
+    'tensorflow=1.11*' \
+    'keras=2.2*' && \
     conda clean -tipsy && \
     fix-permissions $CONDA_DIR && \
     fix-permissions /home/$NB_USER