Revert workaround for r-irkernel from downgrading to ipython 3.2.1

all-spark-notebook/Dockerfile

@@ -80,23 +80,10 @@ RUN $CONDA_DIR/envs/python2/bin/python \
 RUN conda config --add channels r
 RUN conda install --yes \
     'r-base=3.2*' \
+    'r-irkernel=0.4*' \
     'r-ggplot2=1.0*' \
     'r-rcurl=1.95*' && conda clean -yt
 
-# Issue #17: R downgrades ipython to 3.2.1
-# Workaround until packaging reqs update
-RUN conda install --yes -f 'r-irkernel=0.4*' && conda clean -yt
-RUN conda install --yes \
-    'r-base64enc' \
-    'r-irdisplay' \
-    'r-repr' \
-    'r-rzmq' \
-    'r-evaluate' \
-    'r-jsonlite' \
-    'r-magrittr' \
-    'r-stringi' \
-    'r-uuid' && conda clean -yt
-
 # Scala Spark kernel spec
 RUN mkdir -p $HOME/.ipython/kernels/scala
 COPY kernel.json $HOME/.ipython/kernels/scala/

r-notebook/Dockerfile

@@ -17,6 +17,7 @@ USER jovyan
 RUN conda config --add channels r
 RUN conda install --yes \
     'r-base=3.2*' \
+    'r-irkernel=0.4*' \
     'r-plyr=1.8*' \
     'r-devtools=1.8*' \
     'r-dplyr=0.4*' \
@@ -33,15 +34,5 @@ RUN conda install --yes \
     'r-rcurl=1.95*' \
     'r-randomforest=4.6*' && conda clean -yt
 
-# Issue #17: R downgrades ipython to 3.2.1
-# Workaround until packaging reqs update
-RUN conda install --yes -f 'r-irkernel=0.4*' && conda clean -yt
-RUN conda install --yes \
-    'r-base64enc' \
-    'r-irdisplay' \
-    'r-repr' \
-    'r-rzmq' \
-    'r-uuid' && conda clean -yt
-
 # Switch back to root so that supervisord runs under that user
 USER root
\ No newline at end of file