From 2cb5075d31bec31ba92f50e2c9f3086e91eb3d0f Mon Sep 17 00:00:00 2001 From: Carl Boettiger Date: Thu, 20 Dec 2018 20:06:05 -0800 Subject: [PATCH] 3.5.2 --- X11/Dockerfile | 2 +- r-ver/Dockerfile | 3 +-- rstudio/Dockerfile | 4 ++-- tidyverse/Dockerfile | 2 +- verse/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/X11/Dockerfile b/X11/Dockerfile index 9db7fb6..d391e2c 100644 --- a/X11/Dockerfile +++ b/X11/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/r-ver:3.5.1 +FROM rocker/r-ver:3.5.2 ## R's X11 runtime dependencies RUN apt-get update \ diff --git a/r-ver/Dockerfile b/r-ver/Dockerfile index a33c500..56d26a5 100644 --- a/r-ver/Dockerfile +++ b/r-ver/Dockerfile @@ -7,8 +7,7 @@ LABEL org.label-schema.license="GPL-2.0" \ ARG R_VERSION ARG BUILD_DATE -ENV BUILD_DATE ${BUILD_DATE:-2018-12-20} -ENV R_VERSION=${R_VERSION:-3.5.1} \ +ENV R_VERSION=${R_VERSION:-3.5.2} \ LC_ALL=en_US.UTF-8 \ LANG=en_US.UTF-8 \ TERM=xterm diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile index 5df3f44..93a25b4 100644 --- a/rstudio/Dockerfile +++ b/rstudio/Dockerfile @@ -1,7 +1,7 @@ -FROM rocker/r-ver:3.5.1 +FROM rocker/r-ver:3.5.2 ARG RSTUDIO_VERSION -ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.463} +#ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:0.1.463} ARG S6_VERSION ENV S6_VERSION=${S6_VERSION:-v1.21.7.0} ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 diff --git a/tidyverse/Dockerfile b/tidyverse/Dockerfile index 35f8169..9bae67e 100644 --- a/tidyverse/Dockerfile +++ b/tidyverse/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/rstudio:3.5.1 +FROM rocker/rstudio:3.5.2 RUN apt-get update -qq && apt-get -y --no-install-recommends install \ libxml2-dev \ diff --git a/verse/Dockerfile b/verse/Dockerfile index 63c7fcc..067349c 100644 --- a/verse/Dockerfile +++ b/verse/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/tidyverse:3.5.1 +FROM rocker/tidyverse:3.5.2 ENV PATH=$PATH:/opt/TinyTeX/bin/x86_64-linux/ ## Add LaTeX, rticles and bookdown support