Skip to content

Commit 712abd3

Browse files
authored
Merge pull request #47 from deepnote/hannes/pla-3290-fix-r-library-installations
Fix R dependency installs
2 parents fbe8d28 + e311f24 commit 712abd3

File tree

2 files changed

+60
-15
lines changed

2 files changed

+60
-15
lines changed

ir/ir-base/install_R_source.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ fi
3737
apt-get install -y --no-install-recommends \
3838
bash-completion \
3939
ca-certificates \
40+
curl \
4041
file \
4142
fonts-texgyre \
4243
g++ \
@@ -61,7 +62,7 @@ apt-get install -y --no-install-recommends \
6162
zip \
6263
zlib1g
6364

64-
BUILDDEPS="curl \
65+
BUILDDEPS="\
6566
default-jdk \
6667
devscripts \
6768
libbz2-dev \
@@ -143,7 +144,7 @@ make clean
143144

144145
## Add a library directory (for user-installed packages)
145146
mkdir -p "${R_HOME}/site-library"
146-
chown root:staff "${R_HOME}/site-library"
147+
#chown root:staff "${R_HOME}/site-library"
147148
chmod g+ws "${R_HOME}/site-library"
148149

149150
## Fix library path

ir/ir-with-libs/Dockerfile.ir

Lines changed: 57 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,63 @@ ARG CIRCLE_PULL_REQUEST
33

44
FROM deepnote/ir:${R_VERSION}${CIRCLE_PULL_REQUEST:+-ra-${CIRCLE_PULL_REQUEST##*/}}
55

6-
# Install the R libraries
7-
RUN R -e "install.packages('tidyverse', repos='https://cloud.r-project.org', dependencies=TRUE)"
8-
RUN R -e "install.packages('data.table', repos='https://cloud.r-project.org', dependencies=TRUE)"
9-
RUN R -e "install.packages('RSQLite', repos='https://cloud.r-project.org', dependencies=TRUE)"
10-
RUN R -e "install.packages('remotes', repos='https://cloud.r-project.org', dependencies=TRUE)"
11-
RUN R -e "install.packages('reticulate', repos='https://cloud.r-project.org', dependencies=TRUE)"
12-
RUN R -e "install.packages('igraph', repos='https://cloud.r-project.org', dependencies=TRUE)"
13-
RUN R -e "install.packages('plotly', repos='https://cloud.r-project.org', dependencies=TRUE)"
14-
15-
166
# Workaround for Java to install correctly
177
RUN mkdir -p /usr/share/man/man1/
188

19-
RUN R -e "install.packages('rgl', repos='https://cloud.r-project.org', dependencies=TRUE)"
20-
RUN R -e "install.packages('hdf5r', repos='https://cloud.r-project.org', dependencies=TRUE)"
21-
RUN R -e "install.packages('rJava', repos='https://cloud.r-project.org', dependencies=TRUE)"
9+
# Install R lib dependencies
10+
ENV BUILDDEPS="\
11+
default-jdk \
12+
devscripts \
13+
libbz2-dev \
14+
libcairo2-dev \
15+
libcurl4-openssl-dev \
16+
libgit2-dev \
17+
libicu-dev \
18+
libjpeg-dev \
19+
liblzma-dev \
20+
libmagick++-dev \
21+
libpango1.0-dev \
22+
libpcre2-dev \
23+
libpng-dev \
24+
libreadline-dev \
25+
librsvg2-dev \
26+
libtiff5-dev \
27+
libudunits2-dev \
28+
libv8-dev \
29+
libx11-dev \
30+
libxml2-dev \
31+
libxt-dev \
32+
perl \
33+
rsync \
34+
subversion \
35+
tcl-dev \
36+
texinfo \
37+
texlive-extra-utils \
38+
texlive-fonts-extra \
39+
texlive-fonts-recommended \
40+
texlive-latex-extra \
41+
texlive-latex-recommended \
42+
tk-dev \
43+
wget \
44+
x11proto-core-dev \
45+
xauth \
46+
xfonts-base \
47+
xvfb \
48+
zlib1g-dev"
49+
50+
RUN apt-get update && apt-get install -y ${BUILDDEPS} \
51+
&& \
52+
# Install the R libraries
53+
R -e "install.packages('tidyverse', repos='https://cloud.r-project.org', dependencies=TRUE)" && \
54+
R -e "install.packages('data.table', repos='https://cloud.r-project.org', dependencies=TRUE)" && \
55+
R -e "install.packages('RSQLite', repos='https://cloud.r-project.org', dependencies=TRUE)" && \
56+
R -e "install.packages('remotes', repos='https://cloud.r-project.org', dependencies=TRUE)" && \
57+
R -e "install.packages('reticulate', repos='https://cloud.r-project.org', dependencies=TRUE)" && \
58+
R -e "install.packages('igraph', repos='https://cloud.r-project.org', dependencies=TRUE)" && \
59+
R -e "install.packages('plotly', repos='https://cloud.r-project.org', dependencies=TRUE)" && \
60+
R -e "install.packages('rgl', repos='https://cloud.r-project.org', dependencies=TRUE)" && \
61+
R -e "install.packages('hdf5r', repos='https://cloud.r-project.org', dependencies=TRUE)" && \
62+
R -e "install.packages('rJava', repos='https://cloud.r-project.org', dependencies=TRUE)" && \
63+
apt-get clean && \
64+
apt-get remove --purge -y ${BUILDDEPS} && \
65+
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

0 commit comments

Comments
 (0)