Commit 2c7802b5 authored by jakirkham's avatar jakirkham

Merge pull request #149 from jakirkham/r_channel_squash

Add and install from the r channel with conda
parents 457c3edf af11fbc3
...@@ -76,8 +76,8 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ ...@@ -76,8 +76,8 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \
&& conda clean -tipsy && conda clean -tipsy
# R packages # R packages
RUN conda config --add channels r RUN conda config --add channels r && \
RUN conda install --quiet --yes \ conda install --quiet --yes \
'r-base=3.2*' \ 'r-base=3.2*' \
'r-irkernel=0.5*' \ 'r-irkernel=0.5*' \
'r-ggplot2=1.0*' \ 'r-ggplot2=1.0*' \
......
...@@ -73,8 +73,8 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ ...@@ -73,8 +73,8 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \
&& conda clean -tipsy && conda clean -tipsy
# 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 && \
RUN conda install --quiet --yes \ conda install --quiet --yes \
'rpy2=2.7*' \ 'rpy2=2.7*' \
'r-base=3.2*' \ 'r-base=3.2*' \
'r-irkernel=0.5*' \ 'r-irkernel=0.5*' \
......
...@@ -17,8 +17,8 @@ RUN apt-get update && \ ...@@ -17,8 +17,8 @@ RUN apt-get update && \
USER jovyan USER jovyan
# R packages # R packages
RUN conda config --add channels r RUN conda config --add channels r && \
RUN conda install --quiet --yes \ conda install --quiet --yes \
'r-base=3.2*' \ 'r-base=3.2*' \
'r-irkernel=0.5*' \ 'r-irkernel=0.5*' \
'r-plyr=1.8*' \ 'r-plyr=1.8*' \
......
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