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

Commit

Permalink
3.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cboettig committed Dec 21, 2018
1 parent 3ec2c99 commit 546658f
Show file tree
Hide file tree
Showing 5 changed files with 19 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.3.3
FROM rocker/r-ver:3.4.0

## R's X11 runtime dependencies
RUN apt-get update \
Expand Down
19 changes: 11 additions & 8 deletions r-ver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:jessie
FROM debian:stretch

LABEL org.label-schema.license="GPL-2.0" \
org.label-schema.vcs-url="https://github.com/rocker-org/rocker-versioned" \
Expand All @@ -7,13 +7,12 @@ LABEL org.label-schema.license="GPL-2.0" \

ARG R_VERSION
ARG BUILD_DATE
ENV BUILD_DATE ${BUILD_DATE:-2017-04-21}
ENV R_VERSION=${R_VERSION:-3.3.3} \
ENV BUILD_DATE ${BUILD_DATE:-2017-06-30}
ENV R_VERSION=${R_VERSION:-3.4.0} \
LC_ALL=en_US.UTF-8 \
LANG=en_US.UTF-8 \
TERM=xterm

## dependencies
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
bash-completion \
Expand All @@ -26,12 +25,13 @@ RUN apt-get update \
libblas-dev \
libbz2-1.0 \
libcurl3 \
libicu52 \
libicu57 \
libjpeg62-turbo \
libopenblas-dev \
libpangocairo-1.0-0 \
libpcre3 \
libpng12-0 \
libpng16-16 \
libreadline7 \
libtiff5 \
liblzma5 \
locales \
Expand All @@ -58,8 +58,8 @@ RUN apt-get update \
libx11-dev \
libxt-dev \
perl \
tcl8.5-dev \
tk8.5-dev \
tcl8.6-dev \
tk8.6-dev \
texinfo \
texlive-extra-utils \
texlive-fonts-recommended \
Expand Down Expand Up @@ -121,6 +121,9 @@ 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
6 changes: 5 additions & 1 deletion rstudio/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rocker/r-ver:3.3.3
FROM rocker/r-ver:3.4.0

ARG RSTUDIO_VERSION
## Comment the next line to use the latest RStudio Server version by default
Expand All @@ -21,6 +21,10 @@ RUN apt-get update \
python-setuptools \
sudo \
wget \
multiarch-support \
&& wget -O libssl1.0.0.deb http://ftp.debian.org/debian/pool/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u8_amd64.deb \
&& dpkg -i libssl1.0.0.deb \
&& rm libssl1.0.0.deb \
&& RSTUDIO_LATEST=$(wget --no-check-certificate -qO- https://s3.amazonaws.com/rstudio-server/current.ver) \
&& [ -z "$RSTUDIO_VERSION" ] && RSTUDIO_VERSION=$RSTUDIO_LATEST || true \
&& wget -q http://download2.rstudio.org/rstudio-server-${RSTUDIO_VERSION}-amd64.deb \
Expand Down
2 changes: 1 addition & 1 deletion tidyverse/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rocker/rstudio:3.3.3
FROM rocker/rstudio:3.4.0

RUN apt-get update -qq && apt-get -y --no-install-recommends install \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion verse/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rocker/tidyverse:3.3.3
FROM rocker/tidyverse:3.4.0

## Add LaTeX, rticles and bookdown support
RUN apt-get update \
Expand Down

0 comments on commit 546658f

Please sign in to comment.