Skip to content

Commit 7dcb272

Browse files
committed
Extend spec to include os
1 parent ca33ec4 commit 7dcb272

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

R/dockerfile-core.R

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ dockerfile <- function() {
99
metadata = list(
1010
base_image = NULL,
1111
package_manager = NULL,
12-
r_version = NULL
12+
r_version = NULL,
13+
os = NULL
1314
)
1415
),
1516
class = "dockerfile"
@@ -97,7 +98,8 @@ add_dockerfile_line <- function(dockerfile, instruction, args) {
9798
# Extract just the image part, not the "AS build" part
9899
base_image <- strsplit(args, " AS ")[[1]][1]
99100
dockerfile$metadata$base_image <- base_image
100-
dockerfile$metadata$package_manager <- get_package_manager(base_image)
101+
dockerfile$metadata$package_manager <- determine_package_manager(base_image)
102+
dockerfile$metadata$os <- determine_os(base_image)
101103

102104
# Try to extract R version from rocker images
103105
if (grepl("^rocker/r-ver:", base_image)) {

R/dockerfile-io.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ read_dockerfile <- function(file) {
4141
if (grepl("^FROM ", line, ignore.case = TRUE)) {
4242
base_image <- sub("^FROM\\s+([^\\s]+).*$", "\\1", line, ignore.case = TRUE)
4343
df$metadata$base_image <- base_image
44-
df$metadata$package_manager <- get_package_manager(base_image)
44+
df$metadata$package_manager <- determine_package_manager(base_image)
45+
df$metadata$os <- determine_os(base_image)
4546

4647
# Try to extract R version from rocker images
4748
if (grepl("^rocker/r-ver:", base_image)) {

0 commit comments

Comments
 (0)