X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6766d1b04bd238d05890f3ec221c65e84920dde6..22102137c1e5eda8543c79d30d963ceb9e9a47af:/lib/crunchrun/executor.go

diff --git a/lib/crunchrun/executor.go b/lib/crunchrun/executor.go
index 09258ed9db..65bf7427b9 100644
--- a/lib/crunchrun/executor.go
+++ b/lib/crunchrun/executor.go
@@ -34,13 +34,10 @@ type containerSpec struct {
 // containerExecutor is an interface to a container runtime
 // (docker/singularity).
 type containerExecutor interface {
-	// ImageLoaded determines whether the given image is already
-	// available to use without calling ImageLoad.
-	ImageLoaded(imageID string) bool
-
 	// ImageLoad loads the image from the given tarball such that
 	// it can be used to create/start a container.
-	LoadImage(filename string) error
+	LoadImage(imageID string, imageTarballPath string, container arvados.Container, keepMount string,
+		containerClient *arvados.Client) error
 
 	// Wait for the container process to finish, and return its
 	// exit code. If applicable, also remove the stopped container
@@ -61,7 +58,4 @@ type containerExecutor interface {
 
 	// Release resources (temp dirs, stopped containers)
 	Close()
-
-	// Give the executor access to arvados client & container info
-	SetArvadoClient(containerClient *arvados.Client, container arvados.Container)
 }