Commit cb1cf337 authored by Renaud Lancelot's avatar Renaud Lancelot 🌍
Browse files

Merge branch 'master' of forgemia.inra.fr:umr-astre/covid19-mortality

parents b5251e8a 44b5780c
Pipeline #15349 failed with stage
in 3 minutes and 51 seconds
...@@ -2,6 +2,19 @@ ...@@ -2,6 +2,19 @@
# Source for the docker image registry.forgemia.inra.fr/umr-astre/covid19-mortality # Source for the docker image registry.forgemia.inra.fr/umr-astre/covid19-mortality
# (c) 2020 Facundo Muñoz # (c) 2020 Facundo Muñoz
# Usage:
# - Reproduce CI locally:
# sudo docker pull registry.forgemia.inra.fr/umr-astre/covid19-mortality
# sudo docker run -e PASSWORD=fmstudio -p 8787:8787 --rm -it -v $(pwd):/home/rstudio/covid19-mortality registry.forgemia.inra.fr/umr-astre/covid19-mortality # Run from the project root dir.
# [browse to localhost:8787] username: rstudio, password: fmstudio
# drake::r_make()
#
# - Modify and update Docker image
# sudo docker build -t registry.forgemia.inra.fr/umr-astre/covid19-mortality .
# [test]
# sudo docker push registry.forgemia.inra.fr/umr-astre/covid19-mortality
FROM rocker/geospatial FROM rocker/geospatial
LABEL maintainer="Facundo Muñoz facundo.munoz@cirad.fr" LABEL maintainer="Facundo Muñoz facundo.munoz@cirad.fr"
...@@ -81,12 +94,39 @@ unicode-math \ ...@@ -81,12 +94,39 @@ unicode-math \
xunicode xunicode
# Install R-package dependencies for compiling reports # Install R-package dependencies for compiling reports
RUN ["install2.r", "ade4", "Cairo", "countrycode", "drake", "furrr", "future.callr", "here", "hrbrthemes", "janitor", "knitr", "latticeExtra", "pacman", "readxl", "rjson", "rmarkdown", "rmdformats"] RUN ["install2.r", \
"ade4", \
"Cairo", \
"countrycode", \
"cowplot", \
"distill", \
"downloader", \
"drake", \
"furrr", \
"future.callr", \
"gratia", \
"here", \
"hrbrthemes", \
"janitor", \
"kableExtra", \
"knitr", \
"latticeExtra", \
"mvnfast", \
"NCmisc", \
"pacman", \
"patchwork", \
"proftools", \
"reader", \
"readxl", \
"rjson", \
"rmarkdown", \
"rmdformats" \
]
## Only needed with the option fig_crop ## Only needed with the option fig_crop
## which gives issues with device Cairo ## which gives issues with device Cairo
## https://github.com/yihui/knitr/issues/1365 ## https://github.com/yihui/knitr/issues/1365
RUN ["install2.r", "magick"] # RUN ["install2.r", "magick"]
# Set up environment # Set up environment
RUN echo 'alias ll="ls -lh --color=tty"' >> ~/.bashrc RUN echo 'alias ll="ls -lh --color=tty"' >> ~/.bashrc
...@@ -16,7 +16,7 @@ pacman::p_load( ...@@ -16,7 +16,7 @@ pacman::p_load(
knitr, knitr,
lattice, lattice,
latticeExtra, latticeExtra,
magick, # magick, # fig_crop conflicts with Cairo: https://github.com/yihui/knitr/issues/1365
maptools, maptools,
mgcv, mgcv,
raster, raster,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment