From 9c5f807b5bb504e6fad3634761588a96e6455a13 Mon Sep 17 00:00:00 2001 From: Bob Rudis Date: Mon, 6 Feb 2017 15:42:22 -0500 Subject: [PATCH] fixup some harbor/docker things that were broken --- NAMESPACE | 1 + R/docker.r | 4 ++-- R/splashr-package.R | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 09ebb08..db8f02e 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -19,6 +19,7 @@ export(splash_debug) export(start_splash) export(stop_splash) export(writeHAR) +import(harbor) import(httr) import(magick) import(purrr) diff --git a/R/docker.r b/R/docker.r index 670de10..3fd0f70 100644 --- a/R/docker.r +++ b/R/docker.r @@ -8,7 +8,7 @@ #' stop_splash(splash_container) #' } install_splash <- function() { - harbor::docker_pull(localhost, "scrapinghub/splash") + harbor::docker_pull(harbor::localhost, "scrapinghub/splash") } #' Start a Splash server Docker container @@ -24,7 +24,7 @@ install_splash <- function() { #' stop_splash(splash_container) #' } start_splash <- function() { - harbor::docker_run(localhost, image = "scrapinghub/splash", detach = TRUE, + harbor::docker_run(harbor::localhost, image = "scrapinghub/splash", detach = TRUE, docker_opts = "-p 5023:5023 -p 8050:8050 -p 8051:8051") } diff --git a/R/splashr-package.R b/R/splashr-package.R index b372784..0c3c17f 100644 --- a/R/splashr-package.R +++ b/R/splashr-package.R @@ -14,7 +14,7 @@ #' @name splashr #' @docType package #' @author Bob Rudis (bob@@rud.is) -#' @import purrr httr magick +#' @import purrr httr magick harbor #' @importFrom HARtools writeHAR HARviewer renderHARviewer HARviewerOutput #' @importFrom xml2 read_html url_parse #' @importFrom jsonlite fromJSON