diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile index 73c88f5a..2bffec5f 100644 --- a/all-spark-notebook/Dockerfile +++ b/all-spark-notebook/Dockerfile @@ -20,11 +20,11 @@ RUN apt-get update && \ USER $NB_USER # R packages -RUN conda config --system --add channels r && \ - conda install --quiet --yes \ +RUN conda install --quiet --yes \ 'r-base=3.3.2' \ 'r-irkernel=0.7*' \ 'r-ggplot2=2.2*' \ + 'r-sparklyr=0.5*' \ 'r-rcurl=1.95*' && conda clean -tipsy # Apache Toree kernel @@ -32,6 +32,6 @@ RUN pip --no-cache-dir install https://dist.apache.org/repos/dist/dev/incubator/ RUN jupyter toree install --sys-prefix # Spylon-kernel -RUN conda install --quiet --yes 'spylon-kernel=0.2*' && \ +RUN conda install --quiet --yes 'spylon-kernel=0.4*' && \ conda clean -tipsy RUN python -m spylon_kernel install --sys-prefix diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index 82790d12..3fcf752c 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -55,22 +55,25 @@ USER $NB_USER # Setup work directory for backward-compatibility RUN mkdir /home/$NB_USER/work -# Install conda as jovyan +# Install conda as jovyan and check the md5 sum provided on the download site +ENV MINICONDA_VERSION 4.3.21 RUN cd /tmp && \ mkdir -p $CONDA_DIR && \ - wget --quiet https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86_64.sh && \ - echo "c59b3dd3cad550ac7596e0d599b91e75d88826db132e4146030ef471bb434e9a *Miniconda3-4.2.12-Linux-x86_64.sh" | sha256sum -c - && \ - /bin/bash Miniconda3-4.2.12-Linux-x86_64.sh -f -b -p $CONDA_DIR && \ - rm Miniconda3-4.2.12-Linux-x86_64.sh && \ - $CONDA_DIR/bin/conda config --system --add channels conda-forge && \ + wget --quiet https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \ + echo "c1c15d3baba15bf50293ae963abef853 *Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh" | md5sum -c - && \ + /bin/bash Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh -f -b -p $CONDA_DIR && \ + rm Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \ + $CONDA_DIR/bin/conda config --system --prepend channels conda-forge && \ $CONDA_DIR/bin/conda config --system --set auto_update_conda false && \ + $CONDA_DIR/bin/conda config --system --set show_channel_urls true && \ + $CONDA_DIR/bin/conda update --all && \ conda clean -tipsy # Install Jupyter Notebook and Hub RUN conda install --quiet --yes \ 'notebook=5.0.*' \ 'jupyterhub=0.7.*' \ - 'jupyterlab=0.18.*' \ + 'jupyterlab=0.24.*' \ && conda clean -tipsy USER root diff --git a/minimal-notebook/Dockerfile b/minimal-notebook/Dockerfile index 3b56ed16..be058cd3 100644 --- a/minimal-notebook/Dockerfile +++ b/minimal-notebook/Dockerfile @@ -9,24 +9,25 @@ USER root # Install all OS dependencies for fully functional notebook server RUN apt-get update && apt-get install -yq --no-install-recommends \ - git \ - vim \ - jed \ - emacs \ build-essential \ - python-dev \ - unzip \ + emacs \ + git \ + inkscape \ + jed \ libsm6 \ + libxext-dev \ + libxrender1 \ + lmodern \ pandoc \ - texlive-latex-base \ - texlive-latex-extra \ + python-dev \ texlive-fonts-extra \ texlive-fonts-recommended \ texlive-generic-recommended \ + texlive-latex-base \ + texlive-latex-extra \ texlive-xetex \ - lmodern \ - libxrender1 \ - inkscape \ + vim \ + unzip \ && apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile index 15747d3d..c9559d54 100644 --- a/r-notebook/Dockerfile +++ b/r-notebook/Dockerfile @@ -17,8 +17,7 @@ RUN apt-get update && \ USER $NB_USER # R packages -RUN conda config --system --add channels r && \ - conda install --quiet --yes \ +RUN conda install --quiet --yes \ 'r-base=3.3.2' \ 'r-irkernel=0.7*' \ 'r-plyr=1.8*' \