Skip to content
This repository was archived by the owner on Mar 2, 2022. It is now read-only.

Commit e08a522

Browse files
committed
3.5.0
1 parent e86ca09 commit e08a522

File tree

5 files changed

+18
-22
lines changed

5 files changed

+18
-22
lines changed

X11/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rocker/r-ver:3.4.4
1+
FROM rocker/r-ver:3.5.0
22

33
## R's X11 runtime dependencies
44
RUN apt-get update \

r-ver/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ LABEL org.label-schema.license="GPL-2.0" \
77

88
ARG R_VERSION
99
ARG BUILD_DATE
10-
ENV BUILD_DATE ${BUILD_DATE:-2018-04-23}
11-
ENV R_VERSION=${R_VERSION:-3.4.4} \
10+
ENV BUILD_DATE ${BUILD_DATE:-2018-07-02}
11+
ENV R_VERSION=${R_VERSION:-3.5.0} \
1212
LC_ALL=en_US.UTF-8 \
1313
LANG=en_US.UTF-8 \
1414
TERM=xterm

rstudio/Dockerfile

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rocker/r-ver:3.4.4
1+
FROM rocker/r-ver:3.5.0
22

33
ARG RSTUDIO_VERSION
44
## Comment the next line to use the latest RStudio Server version by default
@@ -68,13 +68,13 @@ RUN apt-get update \
6868
&& tar xzf /tmp/s6-overlay-amd64.tar.gz -C / \
6969
&& mkdir -p /etc/services.d/rstudio \
7070
&& echo '#!/usr/bin/with-contenv bash \
71-
\n## load /etc/environment vars first: \
72-
\n for line in $( cat /etc/environment ) ; do export $line ; done \
73-
\n exec /usr/lib/rstudio-server/bin/rserver --server-daemonize 0' \
74-
> /etc/services.d/rstudio/run \
75-
&& echo '#!/bin/bash \
76-
\n rstudio-server stop' \
77-
> /etc/services.d/rstudio/finish
71+
\n## load /etc/environment vars first: \
72+
\n for line in $( cat /etc/environment ) ; do export $line ; done \
73+
\n exec /usr/lib/rstudio-server/bin/rserver --server-daemonize 0' \
74+
> /etc/services.d/rstudio/run \
75+
&& echo '#!/bin/bash \
76+
\n rstudio-server stop' \
77+
> /etc/services.d/rstudio/finish
7878

7979
COPY userconf.sh /etc/cont-init.d/userconf
8080

@@ -88,9 +88,4 @@ EXPOSE 8787
8888
## automatically link a shared volume for kitematic users
8989
VOLUME /home/rstudio/kitematic
9090

91-
COPY user-settings /home/rstudio/.rstudio/monitored/user-settings/
92-
# No chown will cause "RStudio Initalization Error"
93-
# "Error occurred during the transmission"; RStudio will not load.
94-
RUN chown -R rstudio:rstudio /home/rstudio/.rstudio
95-
9691
CMD ["/init"]

tidyverse/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rocker/rstudio:3.4.4
1+
FROM rocker/rstudio:3.5.0
22

33
RUN apt-get update -qq && apt-get -y --no-install-recommends install \
44
libxml2-dev \

verse/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rocker/tidyverse:3.4.4
1+
FROM rocker/tidyverse:3.5.0
22
ENV PATH=$PATH:/opt/TinyTeX/bin/x86_64-linux/
33

44
## Add LaTeX, rticles and bookdown support
@@ -10,7 +10,7 @@ RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \
1010
## for rJava
1111
default-jdk \
1212
## Nice Google fonts
13-
fonts-roboto \
13+
fonts-roboto \
1414
## used by some base R plots
1515
ghostscript \
1616
## used to build rJava and other packages
@@ -25,11 +25,11 @@ RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \
2525
librdf0-dev \
2626
## for V8-based javascript wrappers
2727
libv8-dev \
28-
## R CMD Check wants qpdf to check pdf sizes, or throws a Warning
28+
## R CMD Check wants qpdf to check pdf sizes, or throws a Warning
2929
qpdf \
3030
## For building PDF manuals
3131
texinfo \
32-
## for git via ssh key
32+
## for git via ssh key
3333
ssh \
3434
## just because
3535
less \
@@ -48,6 +48,7 @@ RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \
4848
&& tlmgr path add \
4949
&& Rscript -e "tinytex::r_texmf()" \
5050
&& chown -R root:staff /opt/TinyTeX \
51+
&& chown -R root:staff /usr/local/lib/R/site-library \
5152
&& chmod -R g+w /opt/TinyTeX \
5253
&& chmod -R g+wx /opt/TinyTeX/bin \
5354
&& echo "PATH=${PATH}" >> /usr/local/lib/R/etc/Renviron \
@@ -57,6 +58,6 @@ RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \
5758
&& install2.r --error --deps TRUE \
5859
bookdown rticles rmdshower
5960
#
60-
## Consider including:
61+
## Consider including:
6162
# - yihui/printr R package (when released to CRAN)
6263
# - libgsl0-dev (GSL math library dependencies)

0 commit comments

Comments
 (0)