Merge pull request #910 from parente/clkao-patch-2

Bump notebook to 6.0.0, jupyterlab to 1.0.4, conda to 4.7.10

base-notebook/Dockerfile

@@ -68,7 +68,7 @@ RUN mkdir /home/$NB_USER/work && \
 
 # Install conda as jovyan and check the md5 sum provided on the download site
 ENV MINICONDA_VERSION=4.6.14 \
-    CONDA_VERSION=4.7.5
+    CONDA_VERSION=4.7.10
 
 RUN cd /tmp && \
     wget --quiet https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \
@@ -101,9 +101,9 @@ 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.7.8' \
+    'notebook=6.0.0' \
     'jupyterhub=1.0.0' \
-    'jupyterlab=1.0.1' && \
+    'jupyterlab=1.0.4' && \
     conda clean --all -f -y && \
     npm cache clean --force && \
     jupyter notebook --generate-config && \