From bb58a7d24563ebd8cf9a8c87bba44881451614e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Mon, 5 Jul 2021 00:47:18 +0200 Subject: [PATCH] Install pak for all R versions They use separate libraries, so they need separate pak installations. --- r-debug-1/Dockerfile | 1 + r-debug-2/Dockerfile | 1 + r-debug-3/Dockerfile | 2 +- r-debug-4/Dockerfile | 1 + r-debug/Dockerfile | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/r-debug-1/Dockerfile b/r-debug-1/Dockerfile index d302b00..28e394f 100644 --- a/r-debug-1/Dockerfile +++ b/r-debug-1/Dockerfile @@ -5,4 +5,5 @@ FROM wch1/r-devel # RDvalgrind: Install R-devel with valgrind level 2 instrumentation RUN /tmp/buildR.sh valgrind +RUN RDvalgrind -q -e 'install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev")' RUN RDvalgrind -q -e 'pak::pkg_install(c("devtools", "Rcpp", "roxygen2", "testthat", "memoise", "rmarkdown"))' diff --git a/r-debug-2/Dockerfile b/r-debug-2/Dockerfile index fe73ec8..15069a1 100644 --- a/r-debug-2/Dockerfile +++ b/r-debug-2/Dockerfile @@ -4,4 +4,5 @@ FROM wch1/r-debug-1 RUN /tmp/buildR.sh san +RUN RDsan -q -e 'install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev")' RUN RDsan -q -e 'pak::pkg_install(c("devtools", "Rcpp", "roxygen2", "testthat", "memoise", "rmarkdown"))' diff --git a/r-debug-3/Dockerfile b/r-debug-3/Dockerfile index 4692465..54cee6b 100644 --- a/r-debug-3/Dockerfile +++ b/r-debug-3/Dockerfile @@ -12,5 +12,5 @@ RUN sed -i 's/^#!\/bin\/bash/#!\/bin\/bash\nulimit -Ss 131072/' /usr/local/bin/R # Increase stack size in .bashrc, so that it is picked up by RDscriptcsan. RUN echo "\nulimit -Ss 131072" >> $HOME/.bashrc - +RUN RDcsan -q -e 'install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev")' RUN RDcsan -q -e 'pak::pkg_install(c("devtools", "Rcpp", "roxygen2", "testthat", "memoise", "rmarkdown"))' diff --git a/r-debug-4/Dockerfile b/r-debug-4/Dockerfile index ea776c9..94caa01 100644 --- a/r-debug-4/Dockerfile +++ b/r-debug-4/Dockerfile @@ -5,4 +5,5 @@ FROM wch1/r-debug-3 # RDstrictbarrier: Make sure that R objects are protected properly. RUN /tmp/buildR.sh strictbarrier +RUN RDstrictbarrier -q -e 'install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev")' RUN RDstrictbarrier -q -e 'pak::pkg_install(c("devtools", "Rcpp", "roxygen2", "testthat", "memoise", "rmarkdown"))' diff --git a/r-debug/Dockerfile b/r-debug/Dockerfile index 152bbf6..ab53697 100644 --- a/r-debug/Dockerfile +++ b/r-debug/Dockerfile @@ -6,4 +6,5 @@ FROM wch1/r-debug-4 # RDthreadcheck: Make sure that R's memory management functions are called # only from the main R thread. RUN /tmp/buildR.sh threadcheck +RUN RDthreadcheck -q -e 'install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev")' RUN RDthreadcheck -q -e 'pak::pkg_install(c("devtools", "Rcpp", "roxygen2", "testthat", "memoise", "rmarkdown"))'