issue #66 set renv.config.pak.enabled = FALSE

ThinkR-open · Nov 6, 2023 · 63cd6e7 · 63cd6e7
1 parent adcaaf1
commit 63cd6e7
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: dockerfiler
 Title: Easy Dockerfile Creation from R
-Version: 0.2.1.9004
+Version: 0.2.2
 Authors@R: c(
     person("Colin", "Fay", , "[email protected]", role = c("cre", "aut"),
            comment = c(ORCID = "0000-0001-7343-1846")),
@@ -37,7 +37,7 @@ Suggests:
     testthat (>= 3.0.0),
     withr
 VignetteBuilder: knitr
-Config/fusen/version: 0.5.2.9000
+Config/fusen/version: 0.5.1
 Config/testthat/edition: 3
 Encoding: UTF-8
 LazyData: true

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,6 @@
-# dockerfile 0.2.x to 0.3.0
+# dockerfile 0.2.2
+
+- fix : create a `use_pak` parameters in `dock_from_renv` to set `renv.config.pak.enabled = FALSE` instead of `renv.config.pak.enabled = TRUE` to avoid issues with {pak} during `renv::restore()`
 
 - feat: use of {memoise} to cache call to `pak::pkg_system_requirements`
 

diff --git a/R/dock_from_renv.R b/R/dock_from_renv.R
@@ -33,6 +33,7 @@ pkg_system_requirements_mem <- memoise::memoise(
 #' @param renv_version character. The {renv} version to use in the generated Dockerfile. 
 #' By default, it is set to the version specified in the `renv.lock` file. 
 #' If the `renv.lock` file does not specify a {renv} version, the version of {renv} bundled with {dockerfiler}, specifically `dockerfiler::renv$the$metadata$version`, will be used. If you set it to NULL, the latest available version of {renv} will be used.
+#' @param use_pak boolean. If `TRUE` use {pak} to deal with dependencies during `renv::restore()`. FALSE by default
 #' @importFrom utils getFromNamespace
 #' @return A R6 object of class `Dockerfile`.
 #' @details
@@ -65,6 +66,7 @@ dock_from_renv <- function(
   repos = c(CRAN = "https://cran.rstudio.com/"),
   expand = FALSE,
   extra_sysreqs = NULL,
+  use_pak = FALSE,
   renv_version
 ) {
   distro <- match.arg(distro, available_distros)
@@ -256,7 +258,8 @@ dock_from_renv <- function(
 
   dock$RUN(
     sprintf(
-      "echo \"options(renv.config.pak.enabled = TRUE, repos = %s, download.file.method = 'libcurl', Ncpus = 4)\" | tee /usr/local/lib/R/etc/Rprofile.site | tee /usr/lib/R/etc/Rprofile.site",
+      "echo \"options(renv.config.pak.enabled = %s, repos = %s, download.file.method = 'libcurl', Ncpus = 4)\" | tee /usr/local/lib/R/etc/Rprofile.site | tee /usr/lib/R/etc/Rprofile.site",
+      use_pak,
       repos_as_character
     )
   )

diff --git a/dev/flat_dock_from_renv.Rmd b/dev/flat_dock_from_renv.Rmd
@@ -76,6 +76,7 @@ pkg_system_requirements_mem <- memoise::memoise(
 #' @param renv_version character. The {renv} version to use in the generated Dockerfile. 
 #' By default, it is set to the version specified in the `renv.lock` file. 
 #' If the `renv.lock` file does not specify a {renv} version, the version of {renv} bundled with {dockerfiler}, specifically `dockerfiler::renv$the$metadata$version`, will be used. If you set it to NULL, the latest available version of {renv} will be used.
+#' @param use_pak boolean. If `TRUE` use {pak} to deal with dependencies during `renv::restore()`. FALSE by default
 #' @importFrom utils getFromNamespace
 #' @return A R6 object of class `Dockerfile`.
 #' @details
@@ -103,6 +104,7 @@ dock_from_renv <- function(
   repos = c(CRAN = "https://cran.rstudio.com/"),
   expand = FALSE,
   extra_sysreqs = NULL,
+  use_pak = FALSE,
   renv_version
 ) {
   distro <- match.arg(distro, available_distros)
@@ -294,7 +296,8 @@ dock_from_renv <- function(
 
   dock$RUN(
     sprintf(
-      "echo \"options(renv.config.pak.enabled = TRUE, repos = %s, download.file.method = 'libcurl', Ncpus = 4)\" | tee /usr/local/lib/R/etc/Rprofile.site | tee /usr/lib/R/etc/Rprofile.site",
+      "echo \"options(renv.config.pak.enabled = %s, repos = %s, download.file.method = 'libcurl', Ncpus = 4)\" | tee /usr/local/lib/R/etc/Rprofile.site | tee /usr/lib/R/etc/Rprofile.site",
+      use_pak,
       repos_as_character
     )
   )
@@ -364,6 +367,7 @@ writeLines(renv_file, file.path(dir_build, "renv.lock"))
 
 # dock_from_renv ----
 test_that("dock_from_renv works", {
+  # testthat::skip_on_cran()
   # skip_if_not(interactive())
   # Create Dockerfile
 
@@ -472,7 +476,7 @@ test_that("gen_base_image works", {
 
 
 test_that("dock_from_renv works with specific renv", {
-  
+  # testthat::skip_on_cran()
 the_lockfile1.0.0 <- system.file("renv_with_1.0.0.lock",package = "dockerfiler")
 
 for (lf in list(the_lockfile,the_lockfile1.0.0)){

diff --git a/man/dock_from_renv.Rd b/man/dock_from_renv.Rd
diff --git a/tests/testthat/test-dock_from_renv.R b/tests/testthat/test-dock_from_renv.R
@@ -33,6 +33,7 @@ writeLines(renv_file, file.path(dir_build, "renv.lock"))
 
 # dock_from_renv ----
 test_that("dock_from_renv works", {
+  # testthat::skip_on_cran()
   # skip_if_not(interactive())
   # Create Dockerfile
 
@@ -141,7 +142,7 @@ test_that("gen_base_image works", {
 
 
 test_that("dock_from_renv works with specific renv", {
-
+  # testthat::skip_on_cran()
 the_lockfile1.0.0 <- system.file("renv_with_1.0.0.lock",package = "dockerfiler")
 
 for (lf in list(the_lockfile,the_lockfile1.0.0)){