From 546658fc7c6eb1cc48f8a9a9ccb969cf7247a3f1 Mon Sep 17 00:00:00 2001
From: Carl Boettiger <cboettig@gmail.com>
Date: Thu, 20 Dec 2018 19:48:24 -0800
Subject: [PATCH] 3.4.0

---
 X11/Dockerfile       |  2 +-
 r-ver/Dockerfile     | 19 +++++++++++--------
 rstudio/Dockerfile   |  6 +++++-
 tidyverse/Dockerfile |  2 +-
 verse/Dockerfile     |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/X11/Dockerfile b/X11/Dockerfile
index 85f3528..41e51d5 100644
--- a/X11/Dockerfile
+++ b/X11/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocker/r-ver:3.3.3
+FROM rocker/r-ver:3.4.0
 
 ## R's X11 runtime dependencies
 RUN apt-get update \
diff --git a/r-ver/Dockerfile b/r-ver/Dockerfile
index 48226e6..e170e27 100644
--- a/r-ver/Dockerfile
+++ b/r-ver/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM debian:stretch
 
 LABEL org.label-schema.license="GPL-2.0" \
       org.label-schema.vcs-url="https://github.com/rocker-org/rocker-versioned" \
@@ -7,13 +7,12 @@ LABEL org.label-schema.license="GPL-2.0" \
 
 ARG R_VERSION
 ARG BUILD_DATE
-ENV BUILD_DATE ${BUILD_DATE:-2017-04-21}
-ENV R_VERSION=${R_VERSION:-3.3.3} \
+ENV BUILD_DATE ${BUILD_DATE:-2017-06-30}
+ENV R_VERSION=${R_VERSION:-3.4.0} \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     TERM=xterm
 
-## dependencies
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
     bash-completion \
@@ -26,12 +25,13 @@ RUN apt-get update \
     libblas-dev \
     libbz2-1.0 \
     libcurl3 \
-    libicu52 \
+    libicu57 \
     libjpeg62-turbo \
     libopenblas-dev \
     libpangocairo-1.0-0 \
     libpcre3 \
-    libpng12-0 \
+    libpng16-16 \
+    libreadline7 \
     libtiff5 \
     liblzma5 \
     locales \
@@ -58,8 +58,8 @@ RUN apt-get update \
     libx11-dev \
     libxt-dev \
     perl \
-    tcl8.5-dev \
-    tk8.5-dev \
+    tcl8.6-dev \
+    tk8.6-dev \
     texinfo \
     texlive-extra-utils \
     texlive-fonts-recommended \
@@ -121,6 +121,9 @@ RUN apt-get update \
   && ln -s /usr/local/lib/R/site-library/littler/examples/install2.r /usr/local/bin/install2.r \
   && ln -s /usr/local/lib/R/site-library/littler/examples/installGithub.r /usr/local/bin/installGithub.r \
   && ln -s /usr/local/lib/R/site-library/littler/bin/r /usr/local/bin/r \
+  ## TEMPORARY WORKAROUND to get more robust error handling for install2.r prior to littler update
+  && curl -O /usr/local/bin/install2.r https://github.com/eddelbuettel/littler/raw/master/inst/examples/install2.r \
+  && chmod +x /usr/local/bin/install2.r \
   ## Clean up from R source install
   && cd / \
   && rm -rf /tmp/* \
diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile
index 34f1ad2..9160731 100644
--- a/rstudio/Dockerfile
+++ b/rstudio/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocker/r-ver:3.3.3
+FROM rocker/r-ver:3.4.0
 
 ARG RSTUDIO_VERSION
 ## Comment the next line to use the latest RStudio Server version by default
@@ -21,6 +21,10 @@ RUN apt-get update \
     python-setuptools \
     sudo \
     wget \
+    multiarch-support \
+  && wget -O libssl1.0.0.deb http://ftp.debian.org/debian/pool/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u8_amd64.deb \
+  && dpkg -i libssl1.0.0.deb \
+  && rm libssl1.0.0.deb \
   && RSTUDIO_LATEST=$(wget --no-check-certificate -qO- https://s3.amazonaws.com/rstudio-server/current.ver) \
   && [ -z "$RSTUDIO_VERSION" ] && RSTUDIO_VERSION=$RSTUDIO_LATEST || true \
   && wget -q http://download2.rstudio.org/rstudio-server-${RSTUDIO_VERSION}-amd64.deb \
diff --git a/tidyverse/Dockerfile b/tidyverse/Dockerfile
index 3020327..07ddddb 100644
--- a/tidyverse/Dockerfile
+++ b/tidyverse/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocker/rstudio:3.3.3
+FROM rocker/rstudio:3.4.0
 
 RUN apt-get update -qq && apt-get -y --no-install-recommends install \
   libxml2-dev \
diff --git a/verse/Dockerfile b/verse/Dockerfile
index ecf8c73..4f99edd 100644
--- a/verse/Dockerfile
+++ b/verse/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocker/tidyverse:3.3.3
+FROM rocker/tidyverse:3.4.0
 
 ## Add LaTeX, rticles and bookdown support
 RUN apt-get update \