move builder commands to service (#32)

cloudyr · Feb 18, 2017 · b8f688f · b8f688f
1 parent 2350119
commit b8f688f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 13 deletions.
diff --git a/R/container.R b/R/container.R
@@ -140,8 +140,7 @@ gce_vm_template <- function(template = c("rstudio","shiny","opencpu",
                       collapse = "\n")
 
     cloud_init_file <- sprintf(cloud_init_file, 
-                               the_file, 
-                               build_tag, build_tag)
+                               build_tag, build_tag, the_file)
 
   } else {
     warning("No template settings found for ", template)

diff --git a/R/ssh_admin.R b/R/ssh_admin.R
@@ -165,7 +165,7 @@ gce_ssh_setup <- function(instance,
                             instance = ins, 
                             project = project, 
                             zone = zone)
-    gce_check_zone_op(job, verbose = FALSE) 
+    gce_wait(job, verbose = FALSE) 
     myMessage("Public SSH key uploaded to instance", level = 3)
   }
 

diff --git a/inst/cloudconfig/builder.yaml b/inst/cloudconfig/builder.yaml
@@ -5,13 +5,27 @@ users:
   uid: 2000
 
 write_files:
+- path: /etc/systemd/system/builddocker.service
+  permissions: 0644
+  owner: root
+  content: |
+    [Unit]
+    Description=Start Docker build service
+
+    [Service]
+    Type=oneshot
+    RemainAferExit=yes
+    Environment="HOME=/home/gcer"
+    ExecStartPre=/usr/share/google/dockercfg_update.sh
+    ExecStart=/usr/bin/docker build -t %s /home/gcer/build/
+    ExecStart=/usr/bin/docker push %s
+
 - path: /home/gcer/build/Dockerfile
   permissions: 0644
   owner: root
   content: |
 %s
-    
+
 runcmd:
-- cd /home/gcer/build && docker build -t %s .
-- /usr/share/google/dockercfg_update.sh
-- docker push %s
+- systemctl daemon-reload
+- systemctl start builddocker.service
diff --git a/tests/testthat/test_bb_create_vm.R b/tests/testthat/test_bb_create_vm.R
@@ -151,7 +151,7 @@ test_that("We can set metadata on a VM", {
 
   print(job)
 
-  gce_check_zone_op(job)
+  gce_wait(job)
 
   vm <- gce_get_instance("rstudio-test")
 

diff --git a/tests/testthat/test_instances.R b/tests/testthat/test_instances.R
@@ -72,7 +72,7 @@ test_that("We can reset a VM", {
 
   expect_equal(job$kind, "compute#operation")
 
-  gce_check_zone_op(job, wait = 10)
+  gce_wait(job, wait = 10)
 
   cat("\nmarkdev VM reset")
   inst <- gce_get_instance("markdev")
@@ -97,7 +97,7 @@ test_that("We can stop a VM", {
 
   expect_equal(job$kind, "compute#operation")
 
-  gce_check_zone_op(job, wait = 10)
+  gce_wait(job, wait = 10)
 
   cat("\nmarkdev VM stopped")
   inst <- gce_get_instance("markdev")

diff --git a/tests/testthat/test_machinetype.R b/tests/testthat/test_machinetype.R
@@ -52,7 +52,7 @@ test_that("We can change a machine type", {
 
   expect_equal(mt$kind, "compute#operation")
 
-  job <- gce_check_zone_op(mt)
+  job <- gce_wait(mt)
 
   expect_equal(job$status, "DONE")
 
@@ -62,7 +62,7 @@ test_that("We can change a machine type", {
 
   expect_equal(mt$kind, "compute#operation")
 
-  job <- gce_check_zone_op(mt)
+  job <- gce_wait(mt)
 
   expect_equal(job$status, "DONE")
 

diff --git a/tests/testthat/test_zzz_cleanup.R b/tests/testthat/test_zzz_cleanup.R
@@ -12,7 +12,7 @@ test_that("We can delete the test VMs",{
 
   expect_equal(del$kind, "compute#operation")
 
-  vm <- gce_check_zone_op(del, wait = 10)
+  vm <- gce_wait(del, wait = 10)
 
   expect_equal(vm$kind, "compute#operation")
   expect_equal(vm$status, "DONE")