mirror of
https://github.com/jupyter/docker-stacks.git
synced 2025-10-11 12:02:56 +00:00
Upgrade to r-base 3.3.2
Remove pinning for plotting fix and upgrade other R packages
This commit is contained in:
@@ -20,12 +20,11 @@ RUN apt-get update && \
|
|||||||
USER $NB_USER
|
USER $NB_USER
|
||||||
|
|
||||||
# R packages
|
# 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 && \
|
RUN conda config --add channels r && \
|
||||||
conda install --quiet --yes \
|
conda install --quiet --yes \
|
||||||
'r-base=3.3.1 1' \
|
'r-base=3.3.2' \
|
||||||
'r-irkernel=0.7*' \
|
'r-irkernel=0.7*' \
|
||||||
'r-ggplot2=2.1*' \
|
'r-ggplot2=2.2*' \
|
||||||
'r-rcurl=1.95*' && conda clean -tipsy
|
'r-rcurl=1.95*' && conda clean -tipsy
|
||||||
|
|
||||||
# Apache Toree kernel
|
# Apache Toree kernel
|
||||||
|
@@ -66,10 +66,6 @@ RUN cd /tmp && \
|
|||||||
$CONDA_DIR/bin/conda config --system --set auto_update_conda false && \
|
$CONDA_DIR/bin/conda config --system --set auto_update_conda false && \
|
||||||
conda clean -tipsy
|
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
|
# Install Jupyter Notebook and Hub
|
||||||
RUN conda install --quiet --yes \
|
RUN conda install --quiet --yes \
|
||||||
'notebook=4.3*' \
|
'notebook=4.3*' \
|
||||||
|
@@ -26,26 +26,26 @@ RUN echo "deb http://ppa.launchpad.net/staticfloat/juliareleases/ubuntu trusty m
|
|||||||
USER $NB_USER
|
USER $NB_USER
|
||||||
|
|
||||||
# R packages including IRKernel which gets installed globally.
|
# 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 && \
|
RUN conda config --add channels r && \
|
||||||
conda install --quiet --yes \
|
conda install --quiet --yes \
|
||||||
'rpy2=2.8*' \
|
'rpy2=2.8*' \
|
||||||
'r-base=3.3.1 1' \
|
'r-base=3.3.2' \
|
||||||
'r-irkernel=0.7*' \
|
'r-irkernel=0.7*' \
|
||||||
'r-plyr=1.8*' \
|
'r-plyr=1.8*' \
|
||||||
'r-devtools=1.11*' \
|
'r-devtools=1.12*' \
|
||||||
'r-dplyr=0.4*' \
|
'r-dplyr=0.5*' \
|
||||||
'r-ggplot2=2.1*' \
|
'r-ggplot2=2.2*' \
|
||||||
'r-tidyr=0.5*' \
|
'r-tidyr=0.6*' \
|
||||||
'r-shiny=0.13*' \
|
'r-shiny=0.14*' \
|
||||||
'r-rmarkdown=0.9*' \
|
'r-rmarkdown=1.2*' \
|
||||||
'r-forecast=7.1*' \
|
'r-forecast=7.3*' \
|
||||||
'r-stringr=1.0*' \
|
'r-stringr=1.1*' \
|
||||||
'r-rsqlite=1.0*' \
|
'r-rsqlite=1.1*' \
|
||||||
'r-reshape2=1.4*' \
|
'r-reshape2=1.4*' \
|
||||||
'r-nycflights13=0.2*' \
|
'r-nycflights13=0.2*' \
|
||||||
'r-caret=6.0*' \
|
'r-caret=6.0*' \
|
||||||
'r-rcurl=1.95*' \
|
'r-rcurl=1.95*' \
|
||||||
|
'r-crayon=1.3*' \
|
||||||
'r-randomforest=4.6*' && conda clean -tipsy
|
'r-randomforest=4.6*' && conda clean -tipsy
|
||||||
|
|
||||||
# Install IJulia packages as jovyan and then move the kernelspec out
|
# Install IJulia packages as jovyan and then move the kernelspec out
|
||||||
|
@@ -17,21 +17,20 @@ RUN apt-get update && \
|
|||||||
USER $NB_USER
|
USER $NB_USER
|
||||||
|
|
||||||
# R packages
|
# 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 && \
|
RUN conda config --add channels r && \
|
||||||
conda install --quiet --yes \
|
conda install --quiet --yes \
|
||||||
'r-base=3.3.1 1' \
|
'r-base=3.3.2' \
|
||||||
'r-irkernel=0.7*' \
|
'r-irkernel=0.7*' \
|
||||||
'r-plyr=1.8*' \
|
'r-plyr=1.8*' \
|
||||||
'r-devtools=1.11*' \
|
'r-devtools=1.12*' \
|
||||||
'r-dplyr=0.4*' \
|
'r-dplyr=0.5*' \
|
||||||
'r-ggplot2=2.1*' \
|
'r-ggplot2=2.2*' \
|
||||||
'r-tidyr=0.5*' \
|
'r-tidyr=0.6*' \
|
||||||
'r-shiny=0.13*' \
|
'r-shiny=0.14*' \
|
||||||
'r-rmarkdown=0.9*' \
|
'r-rmarkdown=1.2*' \
|
||||||
'r-forecast=7.1*' \
|
'r-forecast=7.3*' \
|
||||||
'r-stringr=1.0*' \
|
'r-stringr=1.1*' \
|
||||||
'r-rsqlite=1.0*' \
|
'r-rsqlite=1.1*' \
|
||||||
'r-reshape2=1.4*' \
|
'r-reshape2=1.4*' \
|
||||||
'r-nycflights13=0.2*' \
|
'r-nycflights13=0.2*' \
|
||||||
'r-caret=6.0*' \
|
'r-caret=6.0*' \
|
||||||
|
Reference in New Issue
Block a user