From e86ca096abcb1e81dec6ce91b65663fa5a39f78b Mon Sep 17 00:00:00 2001
From: Carl Boettiger <cboettig@gmail.com>
Date: Thu, 20 Dec 2018 20:03:00 -0800
Subject: [PATCH] 3.4.4

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

diff --git a/X11/Dockerfile b/X11/Dockerfile
index 1c212c2..e32dc70 100644
--- a/X11/Dockerfile
+++ b/X11/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocker/r-ver:3.4.3
+FROM rocker/r-ver:3.4.4
 
 ## R's X11 runtime dependencies
 RUN apt-get update \
diff --git a/r-ver/Dockerfile b/r-ver/Dockerfile
index 682ee6a..0180ec1 100644
--- a/r-ver/Dockerfile
+++ b/r-ver/Dockerfile
@@ -7,8 +7,8 @@ LABEL org.label-schema.license="GPL-2.0" \
 
 ARG R_VERSION
 ARG BUILD_DATE
-ENV BUILD_DATE ${BUILD_DATE:-2018-03-15}
-ENV R_VERSION=${R_VERSION:-3.4.3} \
+ENV BUILD_DATE ${BUILD_DATE:-2018-04-23}
+ENV R_VERSION=${R_VERSION:-3.4.4} \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     TERM=xterm
@@ -121,9 +121,6 @@ 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 2cea7ec..b0068dc 100644
--- a/rstudio/Dockerfile
+++ b/rstudio/Dockerfile
@@ -1,8 +1,8 @@
-FROM rocker/r-ver:3.4.3
+FROM rocker/r-ver:3.4.4
 
 ARG RSTUDIO_VERSION
 ## Comment the next line to use the latest RStudio Server version by default
-ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.442}
+ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.447}
 ENV PATH=/usr/lib/rstudio-server/bin:$PATH
 
 ## Download and install RStudio server & dependencies
diff --git a/tidyverse/Dockerfile b/tidyverse/Dockerfile
index e9fb555..183b33c 100644
--- a/tidyverse/Dockerfile
+++ b/tidyverse/Dockerfile
@@ -1,13 +1,14 @@
-FROM rocker/rstudio:3.4.3
+FROM rocker/rstudio:3.4.4
 
 RUN apt-get update -qq && apt-get -y --no-install-recommends install \
   libxml2-dev \
   libcairo2-dev \
-  libsqlite-dev \
+  libsqlite3-dev \
   libmariadbd-dev \
   libmariadb-client-lgpl-dev \
   libpq-dev \
   libssh2-1-dev \
+  unixodbc-dev \
   && R -e "source('https://bioconductor.org/biocLite.R')" \
   && install2.r --error \
     --deps TRUE \
diff --git a/verse/Dockerfile b/verse/Dockerfile
index 9eb4df5..1bf61b7 100644
--- a/verse/Dockerfile
+++ b/verse/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocker/tidyverse:3.4.3
+FROM rocker/tidyverse:3.4.4
 ENV PATH=$PATH:/opt/TinyTeX/bin/x86_64-linux/
 
 ## Add LaTeX, rticles and bookdown support
@@ -38,7 +38,7 @@ RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \
   && rm -rf /var/lib/apt/lists/ \
   ## Use tinytex for LaTeX installation
   && install2.r --error tinytex \
-## Admin-based install of TinyTeX:
+  ## Admin-based install of TinyTeX:
   && wget -qO- \
     "https://github.com/yihui/tinytex/raw/master/tools/install-unx.sh" | \
     sh -s - --admin --no-path \