X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4879256386a5be9566f31f2c266b682993029e14..beec7ed54cc2f355480ab0dc0eab439b56537d6e:/lib/crunchrun/docker.go?ds=sidebyside

diff --git a/lib/crunchrun/docker.go b/lib/crunchrun/docker.go
index 861f8c8c19..07f79bbcc2 100644
--- a/lib/crunchrun/docker.go
+++ b/lib/crunchrun/docker.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 	"time"
 
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
 	dockerclient "github.com/docker/docker/client"
@@ -45,13 +46,17 @@ func newDockerExecutor(containerUUID string, logf func(string, ...interface{}),
 	}, err
 }
 
-func (e *dockerExecutor) ImageLoaded(imageID string) bool {
+func (e *dockerExecutor) Runtime() string { return "docker" }
+
+func (e *dockerExecutor) LoadImage(imageID string, imageTarballPath string, container arvados.Container, arvMountPoint string,
+	containerClient *arvados.Client) error {
 	_, _, err := e.dockerclient.ImageInspectWithRaw(context.TODO(), imageID)
-	return err == nil
-}
+	if err == nil {
+		// already loaded
+		return nil
+	}
 
-func (e *dockerExecutor) LoadImage(filename string) error {
-	f, err := os.Open(filename)
+	f, err := os.Open(imageTarballPath)
 	if err != nil {
 		return err
 	}