working build VM (#32)

NEWS.md

@@ -7,6 +7,7 @@
 - Let Rstudio users be added with staff rights so they can install packages etc.
 - Add ability to specify disk size when creating a VM (#38) - thanks @jburos
 - Add firewall functions (#34)
+- Add a builder template to build docker images on a dedicated VM (#32)
 
 # googleComputeEngineR 0.1.0
 

R/container.R

@@ -75,7 +75,7 @@ gce_vm_template <- function(template = c("rstudio","shiny","opencpu",
                             dynamic_image=NULL,
                             dockerfile = NULL,
                             build_name = NULL,
-                            image_family = "gci-stable",
+                            image_family = "cos-stable",
                             name,
                             ...){
 
@@ -134,8 +134,14 @@ gce_vm_template <- function(template = c("rstudio","shiny","opencpu",
     if(is.null(dockerfile)){
       stop("Need to supply Dockerfile file location to build from")
     }
+
+    the_file <- paste("  ", 
+                      readLines(dockerfile, file.info(dockerfile)$size), 
+                      collapse = "\n")
 
-    cloud_init_file <- sprintf(cloud_init_file, dockerfile, build_tag, build_tag)
+    cloud_init_file <- sprintf(cloud_init_file, 
+                               the_file, 
+                               build_tag, build_tag)
 
   } else {
     warning("No template settings found for ", template)

inst/cloudconfig/builder.yaml

@@ -5,14 +5,13 @@ users:
   uid: 2000
 
 write_files:
-- path: /home/gcer/buildfolder/Dockerfile
+- path: /home/gcer/build/Dockerfile
   permissions: 0644
   owner: root
   content: |
-  %s
+%s
 
 runcmd:
-- docker build -t build_me /home/gcer/buildfolder/Dockerfile
-- docker tag build_me %s
+- cd /home/gcer/build && docker build -t %s .
 - /usr/share/google/dockercfg_update.sh
 - docker push %s

tests/testthat/test_images.R

@@ -12,17 +12,17 @@ test_that("We can list images", {
 test_that("We can get an image from a family", {
   skip_on_cran()
 
-  image <- gce_get_image_family(image_project = "google-containers", family = "gci-stable")
+  image <- gce_get_image_family(image_project = "google-containers", family = "cos-stable")
 
   expect_equal(image$kind, "compute#image")
-  expect_equal(image$family, "gci-stable")  
+  expect_equal(image$family, "cos-stable")  
 
 })
 
 test_that("We can get a specific image", {
   skip_on_cran()
 
-  image <- gce_get_image(image_project = "google-containers", image = "gci-stable-53-8530-85-0")
+  image <- gce_get_image(image_project = "google-containers", image = "cos-stable-53-8530-85-0")
 
   expect_equal(image$kind, "compute#image")
 })