projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18098-log-runtime-engine'
[arvados.git]
/
lib
/
crunchrun
/
docker.go
diff --git
a/lib/crunchrun/docker.go
b/lib/crunchrun/docker.go
index 861f8c8c1913f07bab8d7ea722dfa3c643678059..07f79bbcc2d11f0239a6231288a94d84a89f87fb 100644
(file)
--- a/
lib/crunchrun/docker.go
+++ b/
lib/crunchrun/docker.go
@@
-11,6
+11,7
@@
import (
"strings"
"time"
"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"
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
}
}, 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)
_, _, 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
}
if err != nil {
return err
}