diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile index 47d09589..0fc50717 100644 --- a/all-spark-notebook/Dockerfile +++ b/all-spark-notebook/Dockerfile @@ -20,12 +20,11 @@ RUN apt-get update && \ USER $NB_USER # R packages -# Pin r-base to a specific build number for https://github.com/jupyter/docker-stacks/issues/210#issuecomment-246081809 RUN conda config --add channels r && \ conda install --quiet --yes \ - 'r-base=3.3.1 1' \ + 'r-base=3.3.2' \ 'r-irkernel=0.7*' \ - 'r-ggplot2=2.1*' \ + 'r-ggplot2=2.2*' \ 'r-rcurl=1.95*' && conda clean -tipsy # Apache Toree kernel diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index 6644de94..7dbf20be 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -66,10 +66,6 @@ RUN cd /tmp && \ $CONDA_DIR/bin/conda config --system --set auto_update_conda false && \ conda clean -tipsy -# Temporary workaround for https://github.com/jupyter/docker-stacks/issues/210 -# Stick with jpeg 8 to avoid problems with R packages -RUN echo "jpeg 8*" >> /opt/conda/conda-meta/pinned - # Install Jupyter Notebook and Hub RUN conda install --quiet --yes \ 'notebook=4.3*' \ diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index 4dd36688..dcf670f7 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -26,26 +26,26 @@ RUN echo "deb http://ppa.launchpad.net/staticfloat/juliareleases/ubuntu trusty m USER $NB_USER # R packages including IRKernel which gets installed globally. -# Pin r-base to a specific build number for https://github.com/jupyter/docker-stacks/issues/210#issuecomment-246081809 RUN conda config --add channels r && \ conda install --quiet --yes \ 'rpy2=2.8*' \ - 'r-base=3.3.1 1' \ + 'r-base=3.3.2' \ 'r-irkernel=0.7*' \ 'r-plyr=1.8*' \ - 'r-devtools=1.11*' \ - 'r-dplyr=0.4*' \ - 'r-ggplot2=2.1*' \ - 'r-tidyr=0.5*' \ - 'r-shiny=0.13*' \ - 'r-rmarkdown=0.9*' \ - 'r-forecast=7.1*' \ - 'r-stringr=1.0*' \ - 'r-rsqlite=1.0*' \ + 'r-devtools=1.12*' \ + 'r-dplyr=0.5*' \ + 'r-ggplot2=2.2*' \ + 'r-tidyr=0.6*' \ + 'r-shiny=0.14*' \ + 'r-rmarkdown=1.2*' \ + 'r-forecast=7.3*' \ + 'r-stringr=1.1*' \ + 'r-rsqlite=1.1*' \ 'r-reshape2=1.4*' \ 'r-nycflights13=0.2*' \ 'r-caret=6.0*' \ 'r-rcurl=1.95*' \ + 'r-crayon=1.3*' \ 'r-randomforest=4.6*' && conda clean -tipsy # Install IJulia packages as jovyan and then move the kernelspec out diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile index ede7b9d5..8da75bcf 100644 --- a/r-notebook/Dockerfile +++ b/r-notebook/Dockerfile @@ -17,21 +17,20 @@ RUN apt-get update && \ USER $NB_USER # R packages -# Pin r-base to a specific build number for https://github.com/jupyter/docker-stacks/issues/210#issuecomment-246081809 RUN conda config --add channels r && \ conda install --quiet --yes \ - 'r-base=3.3.1 1' \ + 'r-base=3.3.2' \ 'r-irkernel=0.7*' \ 'r-plyr=1.8*' \ - 'r-devtools=1.11*' \ - 'r-dplyr=0.4*' \ - 'r-ggplot2=2.1*' \ - 'r-tidyr=0.5*' \ - 'r-shiny=0.13*' \ - 'r-rmarkdown=0.9*' \ - 'r-forecast=7.1*' \ - 'r-stringr=1.0*' \ - 'r-rsqlite=1.0*' \ + 'r-devtools=1.12*' \ + 'r-dplyr=0.5*' \ + 'r-ggplot2=2.2*' \ + 'r-tidyr=0.6*' \ + 'r-shiny=0.14*' \ + 'r-rmarkdown=1.2*' \ + 'r-forecast=7.3*' \ + 'r-stringr=1.1*' \ + 'r-rsqlite=1.1*' \ 'r-reshape2=1.4*' \ 'r-nycflights13=0.2*' \ 'r-caret=6.0*' \