This repository was archived by the owner on Mar 2, 2022. It is now read-only.
File tree Expand file tree Collapse file tree 5 files changed +10
-12
lines changed Expand file tree Collapse file tree 5 files changed +10
-12
lines changed Original file line number Diff line number Diff line change 1
- FROM rocker/r-ver:3.4.3
1
+ FROM rocker/r-ver:3.4.4
2
2
3
3
# # R's X11 runtime dependencies
4
4
RUN apt-get update \
Original file line number Diff line number Diff line change @@ -7,8 +7,8 @@ LABEL org.label-schema.license="GPL-2.0" \
7
7
8
8
ARG R_VERSION
9
9
ARG BUILD_DATE
10
- ENV BUILD_DATE ${BUILD_DATE:-2018-03-15 }
11
- ENV R_VERSION=${R_VERSION:-3.4.3 } \
10
+ ENV BUILD_DATE ${BUILD_DATE:-2018-04-23 }
11
+ ENV R_VERSION=${R_VERSION:-3.4.4 } \
12
12
LC_ALL=en_US.UTF-8 \
13
13
LANG=en_US.UTF-8 \
14
14
TERM=xterm
@@ -121,9 +121,6 @@ RUN apt-get update \
121
121
&& ln -s /usr/local/lib/R/site-library/littler/examples/install2.r /usr/local/bin/install2.r \
122
122
&& ln -s /usr/local/lib/R/site-library/littler/examples/installGithub.r /usr/local/bin/installGithub.r \
123
123
&& ln -s /usr/local/lib/R/site-library/littler/bin/r /usr/local/bin/r \
124
- # # TEMPORARY WORKAROUND to get more robust error handling for install2.r prior to littler update
125
- && curl -O /usr/local/bin/install2.r https://github.com/eddelbuettel/littler/raw/master/inst/examples/install2.r \
126
- && chmod +x /usr/local/bin/install2.r \
127
124
# # Clean up from R source install
128
125
&& cd / \
129
126
&& rm -rf /tmp/* \
Original file line number Diff line number Diff line change 1
- FROM rocker/r-ver:3.4.3
1
+ FROM rocker/r-ver:3.4.4
2
2
3
3
ARG RSTUDIO_VERSION
4
4
# # Comment the next line to use the latest RStudio Server version by default
5
- ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.442 }
5
+ ENV RSTUDIO_VERSION=${RSTUDIO_VERSION:-1.1.447 }
6
6
ENV PATH=/usr/lib/rstudio-server/bin:$PATH
7
7
8
8
# # Download and install RStudio server & dependencies
Original file line number Diff line number Diff line change 1
- FROM rocker/rstudio:3.4.3
1
+ FROM rocker/rstudio:3.4.4
2
2
3
3
RUN apt-get update -qq && apt-get -y --no-install-recommends install \
4
4
libxml2-dev \
5
5
libcairo2-dev \
6
- libsqlite -dev \
6
+ libsqlite3 -dev \
7
7
libmariadbd-dev \
8
8
libmariadb-client-lgpl-dev \
9
9
libpq-dev \
10
10
libssh2-1-dev \
11
+ unixodbc-dev \
11
12
&& R -e "source('https://bioconductor.org/biocLite.R')" \
12
13
&& install2.r --error \
13
14
--deps TRUE \
Original file line number Diff line number Diff line change 1
- FROM rocker/tidyverse:3.4.3
1
+ FROM rocker/tidyverse:3.4.4
2
2
ENV PATH=$PATH:/opt/TinyTeX/bin/x86_64-linux/
3
3
4
4
# # Add LaTeX, rticles and bookdown support
@@ -38,7 +38,7 @@ RUN wget "https://travis-bin.yihui.name/texlive-local.deb" \
38
38
&& rm -rf /var/lib/apt/lists/ \
39
39
# # Use tinytex for LaTeX installation
40
40
&& install2.r --error tinytex \
41
- # # Admin-based install of TinyTeX:
41
+ # # Admin-based install of TinyTeX:
42
42
&& wget -qO- \
43
43
"https://github.com/yihui/tinytex/raw/master/tools/install-unx.sh" | \
44
44
sh -s - --admin --no-path \
You can’t perform that action at this time.
0 commit comments