Merge pull request #278 from parente/fix-r-plotting-again

Workaround for R plotting regression
jupyter · Sep 14, 2016 · 54552d3 · 54552d3
2 parents 749017d + 0d47f10
commit 54552d3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile
@@ -20,9 +20,10 @@ 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*' \
+    'r-base=3.3.1 1' \
     'r-irkernel=0.6*' \
     'r-ggplot2=2.1*' \
     'r-rcurl=1.95*' && conda clean -tipsy

diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile
@@ -24,10 +24,11 @@ RUN apt-get update && \
 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*' \
+    'r-base=3.3.1 1' \
     'r-irkernel=0.6*' \
     'r-plyr=1.8*' \
     'r-devtools=1.11*' \

diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile
@@ -17,9 +17,10 @@ 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*' \
+    'r-base=3.3.1 1' \
     'r-irkernel=0.6*' \
     'r-plyr=1.8*' \
     'r-devtools=1.11*' \