diff --git a/R/container.R b/R/container.R index c0ac306..0687a01 100644 --- a/R/container.R +++ b/R/container.R @@ -276,7 +276,7 @@ gce_vm_container <- function(file = NULL, #' This will only work on the Google Container optimised containers of image_family google_containers. #' Otherwise you will need to get a container authentication yourself (for now) #' -#' It will start the push but it may take a long time to finish, espeically the first time, +#' It will start the push but it may take a long time to finish, especially the first time, #' this function will return whilst waiting but don't turn off the VM until its finished. #' @return The tag the image was tagged with on GCE #' @export diff --git a/inst/cloudconfig/opencpu.yaml b/inst/cloudconfig/opencpu.yaml index b3930ab..6fc327d 100644 --- a/inst/cloudconfig/opencpu.yaml +++ b/inst/cloudconfig/opencpu.yaml @@ -21,6 +21,7 @@ write_files: --name=opencpu-server \ %s ExecStop=/usr/bin/docker stop opencpu + ExecStopPost=/usr/bin/docker rm opencpu runcmd: - systemctl daemon-reload diff --git a/inst/cloudconfig/r-base.yaml b/inst/cloudconfig/r-base.yaml index 2de90d5..27b9ea3 100644 --- a/inst/cloudconfig/r-base.yaml +++ b/inst/cloudconfig/r-base.yaml @@ -24,6 +24,7 @@ write_files: --net=host \ %s ExecStop=/usr/bin/docker stop r-base + ExecStopPost=/usr/bin/docker rm r-base runcmd: - systemctl daemon-reload diff --git a/inst/cloudconfig/shiny.yaml b/inst/cloudconfig/shiny.yaml index 92458ac..43e87f5 100644 --- a/inst/cloudconfig/shiny.yaml +++ b/inst/cloudconfig/shiny.yaml @@ -27,6 +27,7 @@ write_files: -v /home/gcer/library/:/library/ \ %s ExecStop=/usr/bin/docker stop shiny + ExecStopPost=/usr/bin/docker rm shiny runcmd: - systemctl daemon-reload diff --git a/inst/dockerfiles/googleComputeEngineR-worker/Dockerfile b/inst/dockerfiles/googleComputeEngineR-worker/Dockerfile new file mode 100644 index 0000000..7f66c01 --- /dev/null +++ b/inst/dockerfiles/googleComputeEngineR-worker/Dockerfile @@ -0,0 +1,17 @@ +FROM rocker/verse +MAINTAINER Mark Edmondson (r@sunholo.com) + +# install R package dependencies +RUN apt-get update && apt-get install -y \ + ## clean up + && apt-get clean \ + && rm -rf /var/lib/apt/lists/ \ + && rm -rf /tmp/downloaded_packages/ /tmp/*.rds + +## Install packages from CRAN +RUN install2.r --error \ + -r 'http://cran.rstudio.com' \ + googleComputeEngineR \ + ## install Github packages + ## clean up + && rm -rf /tmp/downloaded_packages/ /tmp/*.rds \ diff --git a/inst/dockerfiles/hadleyverse-crontab/Dockerfile b/inst/dockerfiles/hadleyverse-crontab/Dockerfile index fd58686..7372f97 100644 --- a/inst/dockerfiles/hadleyverse-crontab/Dockerfile +++ b/inst/dockerfiles/hadleyverse-crontab/Dockerfile @@ -18,3 +18,6 @@ RUN install2.r --error \ && Rscript -e "devtools::install_github(c('bnosac/cronR'))" \ ## clean up && rm -rf /tmp/downloaded_packages/ /tmp/*.rds \ + +## Start cron +RUN service cron start \ No newline at end of file