From d927a0c5f0f841e7bcc75d495c53847597bbb676 Mon Sep 17 00:00:00 2001 From: Carl Boettiger Date: Thu, 20 Dec 2018 19:50:50 -0800 Subject: [PATCH] 3.4.2 --- X11/Dockerfile | 2 +- r-ver/Dockerfile | 4 ++-- rstudio/Dockerfile | 6 +++--- tidyverse/Dockerfile | 2 +- verse/Dockerfile | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/X11/Dockerfile b/X11/Dockerfile index 87c2d2c..16efd9a 100644 --- a/X11/Dockerfile +++ b/X11/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/r-ver:3.4.1 +FROM rocker/r-ver:3.4.2 ## R's X11 runtime dependencies RUN apt-get update \ diff --git a/r-ver/Dockerfile b/r-ver/Dockerfile index 95ab885..4c45c75 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-09-28} -ENV R_VERSION=${R_VERSION:-3.4.1} \ +ENV BUILD_DATE ${BUILD_DATE:-2017-11-30} +ENV R_VERSION=${R_VERSION:-3.4.2} \ LC_ALL=en_US.UTF-8 \ LANG=en_US.UTF-8 \ TERM=xterm diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile index 004a94c..3bda6c0 100644 --- a/rstudio/Dockerfile +++ b/rstudio/Dockerfile @@ -1,8 +1,8 @@ -FROM rocker/r-ver:3.4.1 +FROM rocker/r-ver:3.4.2 ARG RSTUDIO_VERSION ## Comment the next line to use the latest RStudio Server version by default -ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.0.153} +ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.383} ENV PATH=/usr/lib/rstudio-server/bin:$PATH ## Download and install RStudio server & dependencies @@ -72,7 +72,7 @@ RUN apt-get update \ \n for line in $( cat /etc/environment ) ; do export $line ; done \ \n exec /usr/lib/rstudio-server/bin/rserver --server-daemonize 0' \ > /etc/services.d/rstudio/run \ - && echo '#!/bin/bash \ + && echo '#!/bin/bash \ \n rstudio-server stop' \ > /etc/services.d/rstudio/finish diff --git a/tidyverse/Dockerfile b/tidyverse/Dockerfile index 51ba83d..b204215 100644 --- a/tidyverse/Dockerfile +++ b/tidyverse/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/rstudio:3.4.1 +FROM rocker/rstudio:3.4.2 RUN apt-get update -qq && apt-get -y --no-install-recommends install \ libxml2-dev \ diff --git a/verse/Dockerfile b/verse/Dockerfile index 9523839..26a0cf1 100644 --- a/verse/Dockerfile +++ b/verse/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/tidyverse:3.4.1 +FROM rocker/tidyverse:3.4.2 ## Add LaTeX, rticles and bookdown support RUN apt-get update \