Skip to content

Commit

Permalink
another file.path fix for Windows (#35)
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkEdmondson1234 committed Feb 20, 2017
1 parent 265e917 commit 1929dff
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
16 changes: 10 additions & 6 deletions R/build.R
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ gce_docker_build <- function(dockerfile, build_name, ...){
dots))

## check for when job is done
## kubernetes API call?
# DO_IT <- TRUE
# while(DO_IT){
# images <- gce_list_registry(vm)
# }

## delete the VM

Expand Down Expand Up @@ -121,6 +124,9 @@ gce_push_registry <- function(instance,

docker_cmd(instance, cmd = "push", args = build_tag, wait = wait)

gce_list_registry(instance,
container_url = container_url,
project = project)
build_tag

}
Expand Down Expand Up @@ -189,7 +195,6 @@ gce_pull_registry <- function(instance,
#' @param instance The VM to run within
#' @param container_url The URL of where the container was saved
#' @param project Project ID for this request, default as set by \link{gce_get_global_project}
#' @param ... Other arguments passed to \link{gce_ssh}
#'
#' @details
#' Currently needs to run on a Google VM, not locally
Expand All @@ -198,17 +203,16 @@ gce_pull_registry <- function(instance,
#'
#' \dontrun{
#'
#' vm <- gce_vm("my_instance")
#' gce_list_registry(vm)
#' vm <- gce_vm("my_instance")
#' gce_list_registry(vm)
#'
#' }
#'
#' @export
#' @family container registry functions
gce_list_registry <- function(instance,
container_url = "gcr.io",
project = gce_get_global_project(),
...){
project = gce_get_global_project()){

search_string <- paste0(container_url, "/", project)

Expand Down
2 changes: 1 addition & 1 deletion R/ssh.R
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ gce_ssh <- function(instance,

if(capture_text) {
# Assume that the remote host uses /tmp as the temp dir, and is unix based
temp_remote <- paste0("/tmp", tempfile("gcer_cmd", ""))
temp_remote <- paste0("/tmp/gce_cmd", idempotency())
temp_local <- tempfile("gcer_cmd")
on.exit(unlink(temp_local))

Expand Down

0 comments on commit 1929dff

Please sign in to comment.