Commit 97a5071c authored by Peter Parente's avatar Peter Parente Committed by GitHub

Merge pull request #238 from poplav/bump_r_version

Update R version to 3.3* in r-notebook and datascience-notebook
parents 8473d357 d7cdfd86
...@@ -26,21 +26,21 @@ USER $NB_USER ...@@ -26,21 +26,21 @@ USER $NB_USER
# R packages including IRKernel which gets installed globally. # R packages including IRKernel which gets installed globally.
RUN conda config --add channels r && \ RUN conda config --add channels r && \
conda install --quiet --yes \ conda install --quiet --yes \
'rpy2=2.7*' \ 'rpy2=2.8*' \
'r-base=3.2*' \ 'r-base=3.3*' \
'r-irkernel=0.5*' \ 'r-irkernel=0.6*' \
'r-plyr=1.8*' \ 'r-plyr=1.8*' \
'r-devtools=1.9*' \ 'r-devtools=1.11*' \
'r-dplyr=0.4*' \ 'r-dplyr=0.4*' \
'r-ggplot2=1.0*' \ 'r-ggplot2=2.1*' \
'r-tidyr=0.3*' \ 'r-tidyr=0.5*' \
'r-shiny=0.12*' \ 'r-shiny=0.13*' \
'r-rmarkdown=0.8*' \ 'r-rmarkdown=0.9*' \
'r-forecast=5.8*' \ 'r-forecast=7.1*' \
'r-stringr=0.6*' \ 'r-stringr=1.0*' \
'r-rsqlite=1.0*' \ 'r-rsqlite=1.0*' \
'r-reshape2=1.4*' \ 'r-reshape2=1.4*' \
'r-nycflights13=0.1*' \ 'r-nycflights13=0.2*' \
'r-caret=6.0*' \ 'r-caret=6.0*' \
'r-rcurl=1.95*' \ 'r-rcurl=1.95*' \
'r-randomforest=4.6*' && conda clean -tipsy 'r-randomforest=4.6*' && conda clean -tipsy
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Jupyter Notebook 4.2.x * Jupyter Notebook 4.2.x
* Conda Python 3.x and Python 2.7.x environments * Conda Python 3.x and Python 2.7.x environments
* pandas, matplotlib, scipy, seaborn, scikit-learn, scikit-image, sympy, cython, patsy, statsmodel, cloudpickle, dill, numba, bokeh pre-installed * pandas, matplotlib, scipy, seaborn, scikit-learn, scikit-image, sympy, cython, patsy, statsmodel, cloudpickle, dill, numba, bokeh pre-installed
* Conda R v3.2.x and channel * Conda R v3.3.x and channel
* plyr, devtools, dplyr, ggplot2, tidyr, shiny, rmarkdown, forecast, stringr, rsqlite, reshape2, nycflights13, caret, rcurl, and randomforest pre-installed * plyr, devtools, dplyr, ggplot2, tidyr, shiny, rmarkdown, forecast, stringr, rsqlite, reshape2, nycflights13, caret, rcurl, and randomforest pre-installed
* Julia v0.3.x with Gadfly, RDatasets and HDF5 pre-installed * Julia v0.3.x with Gadfly, RDatasets and HDF5 pre-installed
* Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda` * Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda`
......
...@@ -19,20 +19,20 @@ USER $NB_USER ...@@ -19,20 +19,20 @@ USER $NB_USER
# R packages # R packages
RUN conda config --add channels r && \ RUN conda config --add channels r && \
conda install --quiet --yes \ conda install --quiet --yes \
'r-base=3.2*' \ 'r-base=3.3*' \
'r-irkernel=0.5*' \ 'r-irkernel=0.6*' \
'r-plyr=1.8*' \ 'r-plyr=1.8*' \
'r-devtools=1.9*' \ 'r-devtools=1.11*' \
'r-dplyr=0.4*' \ 'r-dplyr=0.4*' \
'r-ggplot2=1.0*' \ 'r-ggplot2=2.1*' \
'r-tidyr=0.3*' \ 'r-tidyr=0.5*' \
'r-shiny=0.12*' \ 'r-shiny=0.13*' \
'r-rmarkdown=0.8*' \ 'r-rmarkdown=0.9*' \
'r-forecast=5.8*' \ 'r-forecast=7.1*' \
'r-stringr=0.6*' \ 'r-stringr=1.0*' \
'r-rsqlite=1.0*' \ 'r-rsqlite=1.0*' \
'r-reshape2=1.4*' \ 'r-reshape2=1.4*' \
'r-nycflights13=0.1*' \ 'r-nycflights13=0.2*' \
'r-caret=6.0*' \ 'r-caret=6.0*' \
'r-rcurl=1.95*' \ 'r-rcurl=1.95*' \
'r-randomforest=4.6*' && conda clean -tipsy 'r-randomforest=4.6*' && conda clean -tipsy
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
## What it Gives You ## What it Gives You
* Jupyter Notebook 4.2.x * Jupyter Notebook 4.2.x
* Conda R v3.2.x and channel * Conda R v3.3.x and channel
* plyr, devtools, dplyr, ggplot2, tidyr, shiny, rmarkdown, forecast, stringr, rsqlite, reshape2, nycflights13, caret, rcurl, and randomforest pre-installed * plyr, devtools, dplyr, ggplot2, tidyr, shiny, rmarkdown, forecast, stringr, rsqlite, reshape2, nycflights13, caret, rcurl, and randomforest pre-installed
* Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda` * Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda`
* [tini](https://github.com/krallin/tini) as the container entrypoint and [start-notebook.sh](../minimal-notebook/start-notebook.sh) as the default command * [tini](https://github.com/krallin/tini) as the container entrypoint and [start-notebook.sh](../minimal-notebook/start-notebook.sh) as the default command
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment