From 3ec2c998f570b69c0c4bb9509a28a00f4a4da096 Mon Sep 17 00:00:00 2001 From: Carl Boettiger Date: Thu, 20 Dec 2018 19:47:01 -0800 Subject: [PATCH] 3.3.3 --- X11/Dockerfile | 2 +- r-ver/Dockerfile | 4 ++-- rstudio/Dockerfile | 8 ++++---- tidyverse/Dockerfile | 2 +- verse/Dockerfile | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/X11/Dockerfile b/X11/Dockerfile index 596965f..85f3528 100644 --- a/X11/Dockerfile +++ b/X11/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/r-ver:3.3.2 +FROM rocker/r-ver:3.3.3 ## R's X11 runtime dependencies RUN apt-get update \ diff --git a/r-ver/Dockerfile b/r-ver/Dockerfile index ab29896..48226e6 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-03-06} -ENV R_VERSION=${R_VERSION:-3.3.2} \ +ENV BUILD_DATE ${BUILD_DATE:-2017-04-21} +ENV R_VERSION=${R_VERSION:-3.3.3} \ LC_ALL=en_US.UTF-8 \ LANG=en_US.UTF-8 \ TERM=xterm diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile index e968572..34f1ad2 100644 --- a/rstudio/Dockerfile +++ b/rstudio/Dockerfile @@ -1,8 +1,8 @@ -FROM rocker/r-ver:3.3.2 +FROM rocker/r-ver:3.3.3 ARG RSTUDIO_VERSION ## Comment the next line to use the latest RStudio Server version by default -ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.0.136} +ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.0.143} ENV PATH=/usr/lib/rstudio-server/bin:$PATH ## Download and install RStudio server & dependencies @@ -66,8 +66,8 @@ RUN apt-get update \ && echo '#!/usr/bin/with-contenv bash \ \n## load /etc/environment vars first: \ \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 \ + \n exec /usr/lib/rstudio-server/bin/rserver --server-daemonize 0' \ + > /etc/services.d/rstudio/run \ && echo '#!/bin/bash \ \n rstudio-server stop' \ > /etc/services.d/rstudio/finish diff --git a/tidyverse/Dockerfile b/tidyverse/Dockerfile index afa8107..3020327 100644 --- a/tidyverse/Dockerfile +++ b/tidyverse/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/rstudio:3.3.2 +FROM rocker/rstudio:3.3.3 RUN apt-get update -qq && apt-get -y --no-install-recommends install \ libxml2-dev \ diff --git a/verse/Dockerfile b/verse/Dockerfile index 97848d5..ecf8c73 100644 --- a/verse/Dockerfile +++ b/verse/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/tidyverse:3.3.2 +FROM rocker/tidyverse:3.3.3 ## Add LaTeX, rticles and bookdown support RUN apt-get update \ @@ -6,7 +6,7 @@ RUN apt-get update \ ## for rJava default-jdk \ ## Nice Google fonts - fonts-roboto \ + fonts-roboto \ ## used by some base R plots ghostscript \ ## used to build rJava and other packages