17813: continue refactor & fix tests

[arvados.git] / lib / crunchrun / docker.go

diff --git a/lib/crunchrun/docker.go b/lib/crunchrun/docker.go
index 10a2dd38e8109182d1f41e9f1364a54e8b11d67a..656061b77ec552a811c26dfe18be870b154c1b1e 100644 (file)
--- a/lib/crunchrun/docker.go
+++ b/lib/crunchrun/docker.go
@@ -46,17 +46,15 @@ func newDockerExecutor(containerUUID string, logf func(string, ...interface{}),
        }, err
 }
 
-func (e *dockerExecutor) LoadImage(imageID string, container arvados.Container, arvMountPoint string,
-       containerClient *arvados.Client, keepClient IKeepClient) error {
+func (e *dockerExecutor) LoadImage(imageID string, imageTarballPath string, container arvados.Container, arvMountPoint string,
+       containerClient *arvados.Client) error {
        _, _, err := e.dockerclient.ImageInspectWithRaw(context.TODO(), imageID)
        if err == nil {
                // already loaded
                return nil
        }
 
-       filename := arvMountPoint + "/by_id/" + container.ContainerImage + "/" + imageID + ".tar"
-
-       f, err := os.Open(filename)
+       f, err := os.Open(imageTarballPath)
        if err != nil {
                return err
        }