From 089e2336125496c353e95a2264ff8089c98ff921 Mon Sep 17 00:00:00 2001
From: Carl Boettiger <cboettig@gmail.com>
Date: Thu, 20 Dec 2018 19:51:55 -0800
Subject: [PATCH] 3.4.3

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

diff --git a/X11/Dockerfile b/X11/Dockerfile
index 16efd9a..1c212c2 100644
--- a/X11/Dockerfile
+++ b/X11/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocker/r-ver:3.4.2
+FROM rocker/r-ver:3.4.3
 
 ## R's X11 runtime dependencies
 RUN apt-get update \
diff --git a/r-ver/Dockerfile b/r-ver/Dockerfile
index 4c45c75..682ee6a 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:-2017-11-30}
-ENV R_VERSION=${R_VERSION:-3.4.2} \
+ENV BUILD_DATE ${BUILD_DATE:-2018-03-15}
+ENV R_VERSION=${R_VERSION:-3.4.3} \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     TERM=xterm
diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile
index 3bda6c0..2cea7ec 100644
--- a/rstudio/Dockerfile
+++ b/rstudio/Dockerfile
@@ -1,8 +1,8 @@
-FROM rocker/r-ver:3.4.2
+FROM rocker/r-ver:3.4.3
 
 ARG RSTUDIO_VERSION
 ## Comment the next line to use the latest RStudio Server version by default
-ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.383}
+ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.442}
 ENV PATH=/usr/lib/rstudio-server/bin:$PATH
 
 ## Download and install RStudio server & dependencies
diff --git a/tidyverse/Dockerfile b/tidyverse/Dockerfile
index b204215..e9fb555 100644
--- a/tidyverse/Dockerfile
+++ b/tidyverse/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocker/rstudio:3.4.2
+FROM rocker/rstudio:3.4.3
 
 RUN apt-get update -qq && apt-get -y --no-install-recommends install \
   libxml2-dev \
@@ -17,7 +17,8 @@ RUN apt-get update -qq && apt-get -y --no-install-recommends install \
     devtools \
     formatR \
     remotes \
-    selectr
+    selectr \
+    caTools
 
 ## Notes: Above install2.r uses --deps TRUE to get Suggests dependencies as well,
 ## dplyr and ggplot are already part of tidyverse, but listed explicitly to get their (many) suggested dependencies.
diff --git a/verse/Dockerfile b/verse/Dockerfile
index 26a0cf1..9eb4df5 100644
--- a/verse/Dockerfile
+++ b/verse/Dockerfile
@@ -1,7 +1,11 @@
-FROM rocker/tidyverse:3.4.2
+FROM rocker/tidyverse:3.4.3
+ENV PATH=$PATH:/opt/TinyTeX/bin/x86_64-linux/
 
 ## Add LaTeX, rticles and bookdown support
-RUN apt-get update \
+RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \
+  && dpkg -i texlive-local.deb \
+  && rm texlive-local.deb \
+  && apt-get update \
   && apt-get install -y --no-install-recommends \
     ## for rJava
     default-jdk \
@@ -23,41 +27,36 @@ RUN apt-get update \
     libv8-dev \
     ## R CMD Check wants qpdf to check pdf sizes, or throws a Warning 
     qpdf \
+    ## For building PDF manuals
+    texinfo \
     ## for git via ssh key 
     ssh \
-    ## for building pdfs via pandoc/LaTeX (These are large!)
-    lmodern \
-    texlive-fonts-recommended \
-    texlive-generic-recommended \
-    texlive-humanities \
-    texlive-latex-extra \
-    texlive-science \
-    texinfo \
-    ## just because
+ ## just because
     less \
     vim \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/ \
-  && cd /usr/share/texlive/texmf-dist/tex/latex \
-  ## additional tex files needed for certain rticles templates
-  && wget http://mirrors.ctan.org/macros/latex/contrib/ametsoc.zip \
-  && unzip ametsoc.zip \
-  && rm *.zip \
-## R manuals use inconsolata font, but texlive-fonts-extra is huge, so:
-  && cd /usr/share/texlive/texmf-dist \
-  && wget http://mirrors.ctan.org/install/fonts/inconsolata.tds.zip \
-  && unzip inconsolata.tds.zip \
-  && rm *.zip \
-  && echo "Map zi4.map" >> /usr/share/texlive/texmf-dist/web2c/updmap.cfg \
-  && mktexlsr \
-  && updmap-sys \
+  ## Use tinytex for LaTeX installation
+  && install2.r --error tinytex \
+## Admin-based install of TinyTeX:
+  && wget -qO- \
+    "https://github.com/yihui/tinytex/raw/master/tools/install-unx.sh" | \
+    sh -s - --admin --no-path \
+  && mv ~/.TinyTeX /opt/TinyTeX \
+  && /opt/TinyTeX/bin/*/tlmgr path add \
+  && tlmgr install metafont mfware inconsolata tex ae parskip listings \
+  && tlmgr path add \
+  && Rscript -e "tinytex::r_texmf()" \
+  && chown -R root:staff /opt/TinyTeX \
+  && chmod -R g+w /opt/TinyTeX \
+  && chmod -R g+wx /opt/TinyTeX/bin \
+  && echo "PATH=${PATH}" >> /usr/local/lib/R/etc/Renviron \
   ## Currently (2017-06-06) need devel PKI for ssl issue: https://github.com/s-u/PKI/issues/19
-  && install2.r -r http://rforge.net PKI \
+  && install2.r --error --repo http://rforge.net PKI \
   ## And some nice R packages for publishing-related stuff
   && install2.r --error --deps TRUE \
     bookdown rticles rmdshower
-
+#
 ## Consider including: 
 # - yihui/printr R package (when released to CRAN)
 # - libgsl0-dev (GSL math library dependencies)
-# - librdf0-dev