Merge pull request #588 from parente/fix-netcat

Fix netcat, pin tornado 4.x for R + zmq issues, update various R libs

all-spark-notebook/Dockerfile

@@ -23,10 +23,10 @@ USER $NB_UID
 
 # R packages
 RUN conda install --quiet --yes \
-    'r-base=3.3.2' \
-    'r-irkernel=0.7*' \
+    'r-base=3.4.1' \
+    'r-irkernel=0.8*' \
     'r-ggplot2=2.2*' \
-    'r-sparklyr=0.5*' \
+    'r-sparklyr=0.7*' \
     'r-rcurl=1.95*' && \
     conda clean -tipsy && \
     fix-permissions $CONDA_DIR && \

base-notebook/Dockerfile

@@ -77,10 +77,12 @@ RUN cd /tmp && \
     fix-permissions /home/$NB_USER
 
 # Install Jupyter Notebook and Hub
+# Issue #589: Force tornado < 5.0 until various zmq dependencies are resolved upstream
 RUN conda install --quiet --yes \
-    'notebook=5.2.*' \
+    'notebook=5.4.*' \
     'jupyterhub=0.8.*' \
     'jupyterlab=0.31.*' \
+    'tornado=4.*' \
     && conda clean -tipsy && \
     jupyter labextension install @jupyterlab/hub-extension@^0.8.0 && \
     npm cache clean && \

datascience-notebook/Dockerfile

@@ -42,21 +42,25 @@ USER $NB_UID
 RUN conda config --system --append channels r && \
     conda install --quiet --yes \
     'rpy2=2.8*' \
-    'r-base=3.3.2' \
-    'r-irkernel=0.7*' \
+    'r-base=3.4.1' \
+    'r-irkernel=0.8*' \
     'r-plyr=1.8*' \
-    'r-devtools=1.12*' \
-    'r-tidyverse=1.0*' \
-    'r-shiny=0.14*' \
-    'r-rmarkdown=1.2*' \
-    'r-forecast=7.3*' \
-    'r-rsqlite=1.1*' \
+    'r-devtools=1.13*' \
+    'r-tidyverse=1.1*' \
+    'r-shiny=1.0*' \
+    'r-rmarkdown=1.8*' \
+    'r-forecast=8.2*' \
+    'r-rsqlite=2.0*' \
     'r-reshape2=1.4*' \
     'r-nycflights13=0.2*' \
     'r-caret=6.0*' \
     'r-rcurl=1.95*' \
     'r-crayon=1.3*' \
-    'r-randomforest=4.6*' && \
+    'r-randomforest=4.6*' \
+    'r-htmltools=0.3*' \
+    'r-sparklyr=0.7*' \
+    'r-htmlwidgets=1.0*' \
+    'r-hexbin=1.27*' && \
     conda clean -tipsy && \
     fix-permissions $CONDA_DIR && \
     fix-permissions /home/$NB_USER

minimal-notebook/Dockerfile

@@ -18,6 +18,7 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
     libxext-dev \
     libxrender1 \
     lmodern \
+    netcat \
     pandoc \
     python-dev \
     texlive-fonts-extra \
@@ -26,9 +27,8 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
     texlive-latex-base \
     texlive-latex-extra \
     texlive-xetex \
-    vim \
     unzip \
-    nc \
+    vim \
     && apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 

r-notebook/Dockerfile

@@ -19,15 +19,15 @@ USER $NB_UID
 
 # R packages
 RUN conda install --quiet --yes \
-    'r-base=3.3.2' \
-    'r-irkernel=0.7*' \
+    'r-base=3.4.1' \
+    'r-irkernel=0.8*' \
     'r-plyr=1.8*' \
-    'r-devtools=1.12*' \
-    'r-tidyverse=1.0*' \
-    'r-shiny=0.14*' \
-    'r-rmarkdown=1.2*' \
-    'r-forecast=7.3*' \
-    'r-rsqlite=1.1*' \
+    'r-devtools=1.13*' \
+    'r-tidyverse=1.1*' \
+    'r-shiny=1.0*' \
+    'r-rmarkdown=1.8*' \
+    'r-forecast=8.2*' \
+    'r-rsqlite=2.0*' \
     'r-reshape2=1.4*' \
     'r-nycflights13=0.2*' \
     'r-caret=6.0*' \
@@ -35,8 +35,8 @@ RUN conda install --quiet --yes \
     'r-crayon=1.3*' \
     'r-randomforest=4.6*' \
     'r-htmltools=0.3*' \
-    'r-sparklyr=0.5*' \
-    'r-htmlwidgets=0.9*' \
+    'r-sparklyr=0.7*' \
+    'r-htmlwidgets=1.0*' \
     'r-hexbin=1.27*' && \
     conda clean -tipsy && \
     fix-permissions $CONDA_DIR