From e8048a25dcb1508b40392f25ab9c166256167bc2 Mon Sep 17 00:00:00 2001 From: Peter Parente Date: Thu, 18 Oct 2018 10:18:52 -0400 Subject: [PATCH 1/3] Fix builds by updating to compatible versions --- base-notebook/Dockerfile | 2 +- scipy-notebook/Dockerfile | 5 +++-- tensorflow-notebook/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index 77f76b49..65127ca1 100644 --- a/base-notebook/Dockerfile +++ b/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 && \ diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 251f545e..eb8806e5 100644 --- a/scipy-notebook/Dockerfile +++ b/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 && \ diff --git a/tensorflow-notebook/Dockerfile b/tensorflow-notebook/Dockerfile index 94ed8097..b77f5f88 100644 --- a/tensorflow-notebook/Dockerfile +++ b/tensorflow-notebook/Dockerfile @@ -6,8 +6,8 @@ LABEL maintainer="Jupyter Project " # 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 From 3ecff5f4b7114dcadd1f81ad87ab86ba9a0b037d Mon Sep 17 00:00:00 2001 From: Luciano Resende Date: Tue, 16 Oct 2018 09:35:33 -0700 Subject: [PATCH 2/3] Update to Apache Toree 0.3.0-incubating RC1 The RC1 contains the fix to support latest release of JupyterLab. Fixes #710 --- all-spark-notebook/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile index 8ca06cb4..fcca9a67 100644 --- a/all-spark-notebook/Dockerfile +++ b/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 && \ From 6aabc5026549c7f62840ecd2f8e148f2952d8e24 Mon Sep 17 00:00:00 2001 From: Peter Parente Date: Thu, 18 Oct 2018 12:28:39 -0400 Subject: [PATCH 3/3] Fix broken doc link --- .travis.yml | 1 + docs/using/running.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 283df74d..1d3f316c 100644 --- a/.travis.yml +++ b/.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" diff --git a/docs/using/running.md b/docs/using/running.md index 24e13c79..af34dd4a 100644 --- a/docs/using/running.md +++ b/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. \ No newline at end of file +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.