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

Commit

Permalink
3.4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
cboettig committed Dec 21, 2018
1 parent 089e233 commit e86ca09
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion X11/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rocker/r-ver:3.4.3
FROM rocker/r-ver:3.4.4

## R's X11 runtime dependencies
RUN apt-get update \
Expand Down
7 changes: 2 additions & 5 deletions r-ver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ LABEL org.label-schema.license="GPL-2.0" \

ARG R_VERSION
ARG BUILD_DATE
ENV BUILD_DATE ${BUILD_DATE:-2018-03-15}
ENV R_VERSION=${R_VERSION:-3.4.3} \
ENV BUILD_DATE ${BUILD_DATE:-2018-04-23}
ENV R_VERSION=${R_VERSION:-3.4.4} \
LC_ALL=en_US.UTF-8 \
LANG=en_US.UTF-8 \
TERM=xterm
Expand Down Expand Up @@ -121,9 +121,6 @@ RUN apt-get update \
&& ln -s /usr/local/lib/R/site-library/littler/examples/install2.r /usr/local/bin/install2.r \
&& ln -s /usr/local/lib/R/site-library/littler/examples/installGithub.r /usr/local/bin/installGithub.r \
&& ln -s /usr/local/lib/R/site-library/littler/bin/r /usr/local/bin/r \
## TEMPORARY WORKAROUND to get more robust error handling for install2.r prior to littler update
&& curl -O /usr/local/bin/install2.r https://github.com/eddelbuettel/littler/raw/master/inst/examples/install2.r \
&& chmod +x /usr/local/bin/install2.r \
## Clean up from R source install
&& cd / \
&& rm -rf /tmp/* \
Expand Down
4 changes: 2 additions & 2 deletions rstudio/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM rocker/r-ver:3.4.3
FROM rocker/r-ver:3.4.4

ARG RSTUDIO_VERSION
## Comment the next line to use the latest RStudio Server version by default
ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.442}
ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.447}
ENV PATH=/usr/lib/rstudio-server/bin:$PATH

## Download and install RStudio server & dependencies
Expand Down
5 changes: 3 additions & 2 deletions tidyverse/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
FROM rocker/rstudio:3.4.3
FROM rocker/rstudio:3.4.4

RUN apt-get update -qq && apt-get -y --no-install-recommends install \
libxml2-dev \
libcairo2-dev \
libsqlite-dev \
libsqlite3-dev \
libmariadbd-dev \
libmariadb-client-lgpl-dev \
libpq-dev \
libssh2-1-dev \
unixodbc-dev \
&& R -e "source('https://bioconductor.org/biocLite.R')" \
&& install2.r --error \
--deps TRUE \
Expand Down
4 changes: 2 additions & 2 deletions verse/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rocker/tidyverse:3.4.3
FROM rocker/tidyverse:3.4.4
ENV PATH=$PATH:/opt/TinyTeX/bin/x86_64-linux/

## Add LaTeX, rticles and bookdown support
Expand Down Expand Up @@ -38,7 +38,7 @@ RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \
&& rm -rf /var/lib/apt/lists/ \
## Use tinytex for LaTeX installation
&& install2.r --error tinytex \
## Admin-based install of TinyTeX:
## Admin-based install of TinyTeX:
&& wget -qO- \
"https://github.com/yihui/tinytex/raw/master/tools/install-unx.sh" | \
sh -s - --admin --no-path \
Expand Down

0 comments on commit e86ca09

Please sign in to comment.