diff --git a/.Rbuildignore b/.Rbuildignore index 9828d04..23ba253 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -17,3 +17,5 @@ vignettes_src ^scripts$ ^appveyor\.yml$ ^\.github$ +^.*\.Rproj$ +^\.Rproj\.user$ diff --git a/.gitignore b/.gitignore index 8a6be23..d3023a2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ docs/ __pycache__ README.html stevedore_*.tar.gz +stevedore.Rproj +.Renviron diff --git a/R/docker_client_support.R b/R/docker_client_support.R index 6e89b78..dd7efea 100644 --- a/R/docker_client_support.R +++ b/R/docker_client_support.R @@ -118,7 +118,8 @@ pull_status_printer <- function(stream = stdout()) { cur <- x$progressDetail[["current"]] tot <- x$progressDetail[["total"]] str <- sprintf("%s: %s %s/%s %d%%%s", x[["id"]], x[["status"]], - pretty_bytes(cur), pretty_bytes(tot), + # pretty_bytes(cur), pretty_bytes(tot), + cur, tot, round(cur / tot * 100), endl) } else { @@ -833,7 +834,7 @@ mcr_prepare_push <- function(name, tag, registry_auth) { name <- parse_image_name(name) tag <- name$tag %||% "latest" registry_auth <- api_client$auth$get(name$registry) %||% base64encode("{}") - name <- sprintf("%s/%s", name$registry, name$image) + name <- sprintf("%s/%s", name$registry, name$name) }, list(name = name, tag = tag, registry_auth = registry_auth)) }