Remove containerit dependency for CRAN #32 add documentation

NAMESPACE

@@ -67,7 +67,6 @@ export(cr_deploy_pkgdown)
 export(cr_deploy_plumber)
 export(cr_deploy_r)
 export(cr_deploy_run)
-export(cr_dockerfile_plumber)
 export(cr_email_get)
 export(cr_email_set)
 export(cr_plumber_pubsub)
@@ -98,6 +97,7 @@ importFrom(httr,content)
 importFrom(jsonlite,base64_enc)
 importFrom(jsonlite,toJSON)
 importFrom(openssl,base64_encode)
+importFrom(utils,modifyList)
 importFrom(utils,str)
 importFrom(utils,tar)
 importFrom(yaml,as.yaml)

R/deploy-run.R

@@ -161,10 +161,12 @@ cr_deploy_plumber <- function(api,
 
   # if no dockerfile, attempt to create it
   if(is.null(dockerfile)){
-    myMessage("Creating plumber Dockerfile from ",local, level = 3)
-    # creates and write a dockerfile to the folder
-    cr_dockerfile_plumber(local)
-
+    if(!"Dockerfile" %in% local_files){
+      myMessage("No Dockerfile detected in ",local, level = 3)
+      cr_dockerfile_plumber(local)
+    } else {
+      myMessage("Using existing Dockerfile found in folder", level = 3)
+    }
   }
 
   cr_deploy_run(local = local,

R/docker.R

@@ -1,11 +1,12 @@
 #' Create Dockerfile in the deployment folder
 #'
-#' This uses \link[containerit]{dockerfile} to create a Dockerfile if possible
+#' This did call containerit but its not on CRAN so removed
+#'
+#' @noRd
 #'
 #' @param deploy_folder The folder containing the assessts to deploy
-#' @param ... Other arguments pass to \link[containerit]{dockerfile}
+#' @param ... Other arguments pass to containerit::dockerfile
 #'
-#' @export
 #'
 #' @return An object of class Dockerfile
 #'
@@ -15,33 +16,9 @@
 #' cr_dockerfile_plumber(system.file("example/", package = "googleCloudRunner"))
 #' }
 cr_dockerfile_plumber <- function(deploy_folder, ...){
-  check_package_installed("containerit")
-  docker <- suppressWarnings(
-    containerit::dockerfile(
-      deploy_folder,
-      image = "trestletech/plumber",
-      offline = FALSE,
-      cmd = containerit::Cmd("api.R"),
-      maintainer = NULL,
-      copy = list("./"),
-      container_workdir = NULL,
-      entrypoint = containerit::Entrypoint("R",
-                       params = list("-e",
-                                     "pr <- plumber::plumb(commandArgs()[4]); pr$run(host='0.0.0.0', port=as.numeric(Sys.getenv('PORT')))")),
-      filter_baseimage_pkgs = FALSE,
-      ...))
-
-  write_to <- file.path(deploy_folder, "Dockerfile")
-  containerit::write(docker, file = write_to)
-
-  assert_that(
-    is.readable(write_to)
-  )
-
-  myMessage("Written Dockerfile to ", write_to, level = 3)
-  containerit::print(docker)
-  docker
-
+  stop(
+    "No Dockerfile detected.  Please create one in the deployment folder.  See a guide on website on how to use library(containerit) to do so: https://code.markedmondson.me/googleCloudRunner/articles/cloudrun.html#creating-a-dockerfile-with-containerit"
+    , call. = FALSE)
 }
 
 find_dockerfile <- function(local, dockerfile){