diff --git a/X11/Dockerfile b/X11/Dockerfile index e32dc70..d35df24 100644 --- a/X11/Dockerfile +++ b/X11/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/r-ver:3.4.4 +FROM rocker/r-ver:3.5.0 ## R's X11 runtime dependencies RUN apt-get update \ diff --git a/r-ver/Dockerfile b/r-ver/Dockerfile index 0180ec1..2ba8baf 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-04-23} -ENV R_VERSION=${R_VERSION:-3.4.4} \ +ENV BUILD_DATE ${BUILD_DATE:-2018-07-02} +ENV R_VERSION=${R_VERSION:-3.5.0} \ LC_ALL=en_US.UTF-8 \ LANG=en_US.UTF-8 \ TERM=xterm diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile index b0068dc..0213d83 100644 --- a/rstudio/Dockerfile +++ b/rstudio/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/r-ver:3.4.4 +FROM rocker/r-ver:3.5.0 ARG RSTUDIO_VERSION ## Comment the next line to use the latest RStudio Server version by default @@ -68,13 +68,13 @@ RUN apt-get update \ && tar xzf /tmp/s6-overlay-amd64.tar.gz -C / \ && mkdir -p /etc/services.d/rstudio \ && 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 \ - && echo '#!/bin/bash \ - \n rstudio-server stop' \ - > /etc/services.d/rstudio/finish + \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 \ + && echo '#!/bin/bash \ + \n rstudio-server stop' \ + > /etc/services.d/rstudio/finish COPY userconf.sh /etc/cont-init.d/userconf @@ -88,9 +88,4 @@ EXPOSE 8787 ## automatically link a shared volume for kitematic users VOLUME /home/rstudio/kitematic -COPY user-settings /home/rstudio/.rstudio/monitored/user-settings/ -# No chown will cause "RStudio Initalization Error" -# "Error occurred during the transmission"; RStudio will not load. -RUN chown -R rstudio:rstudio /home/rstudio/.rstudio - CMD ["/init"] diff --git a/tidyverse/Dockerfile b/tidyverse/Dockerfile index 183b33c..146699d 100644 --- a/tidyverse/Dockerfile +++ b/tidyverse/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/rstudio:3.4.4 +FROM rocker/rstudio:3.5.0 RUN apt-get update -qq && apt-get -y --no-install-recommends install \ libxml2-dev \ diff --git a/verse/Dockerfile b/verse/Dockerfile index 1bf61b7..1d1ede9 100644 --- a/verse/Dockerfile +++ b/verse/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/tidyverse:3.4.4 +FROM rocker/tidyverse:3.5.0 ENV PATH=$PATH:/opt/TinyTeX/bin/x86_64-linux/ ## Add LaTeX, rticles and bookdown support @@ -10,7 +10,7 @@ RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \ ## 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 @@ -25,11 +25,11 @@ RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \ librdf0-dev \ ## for V8-based javascript wrappers libv8-dev \ - ## R CMD Check wants qpdf to check pdf sizes, or throws a Warning + ## R CMD Check wants qpdf to check pdf sizes, or throws a Warning qpdf \ ## For building PDF manuals texinfo \ - ## for git via ssh key + ## for git via ssh key ssh \ ## just because less \ @@ -48,6 +48,7 @@ RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \ && tlmgr path add \ && Rscript -e "tinytex::r_texmf()" \ && chown -R root:staff /opt/TinyTeX \ + && chown -R root:staff /usr/local/lib/R/site-library \ && chmod -R g+w /opt/TinyTeX \ && chmod -R g+wx /opt/TinyTeX/bin \ && echo "PATH=${PATH}" >> /usr/local/lib/R/etc/Renviron \ @@ -57,6 +58,6 @@ RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \ && install2.r --error --deps TRUE \ bookdown rticles rmdshower # -## Consider including: +## Consider including: # - yihui/printr R package (when released to CRAN) # - libgsl0-dev (GSL math library dependencies)