Skip to content

Commit 7f1294e

Browse files
merge conflict master -> dev fixed (docker compose container update)
2 parents efe655e + 99c7dfc commit 7f1294e

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

Dockerfile

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright (c) UBC-DSCI Development Team.
2-
FROM rocker/verse:4.1.0
2+
FROM rocker/verse:4.1.1
33

44
# install system dependencies
55
RUN apt-get update --fix-missing \
@@ -11,24 +11,6 @@ RUN apt-get update --fix-missing \
1111
libxrender1 \
1212
libxml2-dev
1313

14-
# install python3 & virtualenv
15-
RUN apt-get install -y \
16-
python3-pip \
17-
python3-dev \
18-
&& pip3 install virtualenv
19-
20-
# install anaconda & put it in the PATH
21-
RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \
22-
wget --quiet https://repo.anaconda.com/archive/Anaconda3-2020.02-Linux-x86_64.sh -O ~/anaconda.sh && \
23-
/bin/bash ~/anaconda.sh -b -p /opt/conda && \
24-
rm ~/anaconda.sh
25-
ENV PATH /opt/conda/bin:$PATH
26-
27-
# install rpy2
28-
RUN conda install -y pip && \
29-
pip install rpy2
30-
ENV LD_LIBRARY_PATH /usr/local/lib/R/lib/:${LD_LIBRARY_PATH}
31-
3214
# install libGLPK, gdal-config, libunits
3315
RUN apt-get install -y libglpk-dev gdal-bin libgdal-dev libudunits2-0 libudunits2-dev
3416

@@ -45,7 +27,9 @@ RUN apt-get update -qq && install2.r --error \
4527
svglite \
4628
tidymodels \
4729
reticulate \
48-
kknn
30+
kknn \
31+
fontawesome \
32+
rsvg
4933

5034
RUN Rscript -e "devtools::install_github('ttimbers/[email protected]')"
5135

0 commit comments

Comments
 (0)