Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# dockerfiler 0.2.4.9xxx

- allow multistage dockerfile creation
- add dedicated cache for `renv::restore`

# dockerfiler 0.2.4

Expand Down
17 changes: 8 additions & 9 deletions R/dock_from_renv.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ pkg_sysreqs_mem <- memoise::memoise(
#' @param repos character. The URL(s) of the repositories to use for `options("repos")`.
#' @param extra_sysreqs character vector. Extra debian system requirements.
#' Will be installed with apt-get install.
#' @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.
#' @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,
#' the version of renv bundled with dockerfiler,
#' 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
Expand Down Expand Up @@ -89,20 +89,20 @@ dock_from_renv <- function(
dock$USER(user)
}
# get renv version

if (missing(renv_version)) {
if (!is.null(lock$Packages$renv$Version)) {
renv_version <- lock$Packages$renv$Version
} else {
renv_version <- dockerfiler::renv$the$metadata$version
}
}
}

message("renv version = ",
message("renv version = ",
ifelse(!is.null(renv_version),renv_version,"the must up to date in the repos")
)


distro_args <- list(sysreqs_platform = sysreqs_platform)

install_cmd <- "apt-get install -y"
Expand Down Expand Up @@ -241,8 +241,7 @@ dock_from_renv <- function(
}

dock$COPY(basename(lockfile), "renv.lock")
dock$RUN("R -e 'renv::restore()'")

dock$RUN("--mount=type=cache,id=renv-cache,target=/root/.cache/R/renv R -e 'renv::restore()'")
dock
}

1 change: 1 addition & 0 deletions man/dockerfiler-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading