Merge branch 'master' into dev

ThinkR-open · Mar 10, 2023 · 383644f · 383644f
2 parents 08f050f + 7a9debb
commit 383644f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -34,6 +34,9 @@
 
 add_dockerfile_with_renv now works well with uppercase in package name
 
+add_dockerfile_with_renv now works well with uppercase in package name
+
+
 # golem 0.3.5
 
 Update in the tests for CRAN (commented a test that made new version of testthat fail).

diff --git a/R/add_dockerfiles_renv.R b/R/add_dockerfiles_renv.R
@@ -58,12 +58,12 @@ add_dockerfile_with_renv_ <- function(
     )
   }
 
-  fs_file_copy(
-    path = lockfile,
-    new_path = output_dir,
-    overwrite = TRUE
-  )
-
+  # fs_file_copy(
+  #   path = lockfile,
+  #   new_path = output_dir,
+  #   overwrite = TRUE
+  # )
+  file.copy(from = lockfile, to = output_dir)
   socle <- dockerfiler::dock_from_renv(
     lockfile = lockfile,
     distro = distro,
@@ -78,7 +78,7 @@ add_dockerfile_with_renv_ <- function(
   socle$write(as = file.path(output_dir, "Dockerfile_base"))
 
 
-  my_dock <- dockerfiler::Dockerfile$new(FROM = tolower(tolower(paste0(golem::get_golem_name(), "_base"))))
+  my_dock <- dockerfiler_Dockerfile$new(FROM = tolower(tolower(paste0(golem::get_golem_name(), "_base"))))
 
   my_dock$COPY("renv.lock.prod", "renv.lock")
 
@@ -208,8 +208,8 @@ add_dockerfile_with_renv <- function(
 docker build -f Dockerfile --progress=plain -t %s .
 docker run -p %s:%s %s
 # then go to 127.0.0.1:%s",
-    paste0(golem::get_golem_name(), "_base"),
-    paste0(golem::get_golem_name(), ":latest"),
+    tolower(paste0(golem::get_golem_name(), "_base")),
+    tolower( paste0(golem::get_golem_name(), ":latest")),
     port,
     port,
     tolower(paste0(golem::get_golem_name(), ":latest")),