Merge pull request #72 from ThinkR-open/dev_tmp

Dev tmp

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dockerfiler
 Title: Easy Dockerfile Creation from R
-Version: 0.2.2.9002
+Version: 0.2.2.9003
 Authors@R: c(
     person("Colin", "Fay", , "[email protected]", role = c("cre", "aut"),
            comment = c(ORCID = "0000-0001-7343-1846")),
@@ -38,9 +38,8 @@ Suggests:
     rmarkdown (>= 2.6),
     testthat (>= 3.0.0),
     withr
-VignetteBuilder: 
-    knitr
-Config/fusen/version: 0.5.2
+VignetteBuilder: knitr
+Config/fusen/version: 0.6.0
 Config/testthat/edition: 3
 Encoding: UTF-8
 LazyData: true

NEWS.md

@@ -2,7 +2,7 @@
 
 - remove sysreqs.r-hub.io to use {pak} instead for system requirement detection
 - move from `pak::pkg_system_requirements` to `pak::pkg_sysreqs()` thanks to @B0ydT 
-
+- `dock_from_renv` allow to specify user to use in Dockerfile
 
 # dockerfile 0.2.2
 

R/dock_from_renv.R

@@ -32,6 +32,7 @@ pkg_sysreqs_mem <- memoise::memoise(
 #'   specifically `r dockerfiler::renv$initialize();toString(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
+#' @param user Name of the user to specify in the Dockerfile with the USER instruction. Default is `NULL`, in which case the user from the FROM image is used.
 #' @importFrom utils getFromNamespace
 #' @return A R6 object of class `Dockerfile`.
 #' @details
@@ -66,6 +67,7 @@ dock_from_renv <- function(
   expand = FALSE,
   extra_sysreqs = NULL,
   use_pak = FALSE,
+  user = NULL,
   renv_version
 ) {
   distro <- match.arg(distro, available_distros)
@@ -83,7 +85,9 @@ dock_from_renv <- function(
     ),
     AS = AS
   )
-
+  if (!is.null(user)) {
+    dock$USER(user)
+  }
   # get renv version
 
   if (missing(renv_version)) {

dev/config_attachment.yaml

@@ -0,0 +1,12 @@
+path.n: NAMESPACE
+path.d: DESCRIPTION
+dir.r: R
+dir.v: vignettes
+dir.t: tests
+extra.suggests: ~
+pkg_ignore: ~
+document: yes
+normalize: yes
+inside_rmd: no
+must.exist: yes
+check_if_suggests_is_installed: yes

dev/config_fusen.yaml

@@ -13,3 +13,4 @@ flat_dock_from_renv.Rmd:
     check: false
     document: false
     overwrite: 'yes'
+    clean: ask

dev/flat_dock_from_renv.Rmd

@@ -75,6 +75,7 @@ pkg_sysreqs_mem <- memoise::memoise(
 #'   specifically `r dockerfiler::renv$initialize();toString(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
+#' @param user Name of the user to specify in the Dockerfile with the USER instruction. Default is `NULL`, in which case the user from the FROM image is used.
 #' @importFrom utils getFromNamespace
 #' @return A R6 object of class `Dockerfile`.
 #' @details
@@ -104,6 +105,7 @@ dock_from_renv <- function(
   expand = FALSE,
   extra_sysreqs = NULL,
   use_pak = FALSE,
+  user = NULL,
   renv_version
 ) {
   distro <- match.arg(distro, available_distros)
@@ -121,7 +123,9 @@ dock_from_renv <- function(
     ),
     AS = AS
   )
-
+  if (!is.null(user)) {
+    dock$USER(user)
+  }
   # get renv version
   
   if (missing(renv_version)) {

vignettes/dockerfile-from-renv-lock.Rmd

@@ -2,7 +2,7 @@
 title: "Dockerfile from renv.lock"
 output: rmarkdown::html_vignette
 vignette: >
-  %\VignetteIndexEntry{dockerfile-from-renv-lock}
+  %\VignetteIndexEntry{Dockerfile from renv.lock}
   %\VignetteEngine{knitr::rmarkdown}
   %\VignetteEncoding{UTF-8}
 ---
@@ -14,32 +14,28 @@ knitr::opts_chunk$set(
 )
 ```
 
-```{r setup}
+```{r}
 library(dockerfiler)
 ```
 
 <!-- WARNING - This vignette is generated by {fusen} from dev/flat_dock_from_renv.Rmd: do not edit by hand -->
 
+
+
 <!--
  You need to run the 'description' chunk in the '0-dev_history.Rmd' file before continuing your code there.
 -->
 
-
 # gen_base_image
-
 
-
 
 
 
 
-
 # Create a Dockerfile from a renv.lock file
 
 
-
 
-
 ```{r example-dock_from_renv}
 #' \dontrun{
 #' dock <- dock_from_renv("renv.lock", distro = "xenial")
@@ -50,3 +46,4 @@ library(dockerfiler)
 
 
 
+