X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/aabea703ee77ca91da710dd9bce9716e5d35d7b2..469ea187586ea8017e26874c2d80414ce7571fae:/lib/crunchrun/docker.go diff --git a/lib/crunchrun/docker.go b/lib/crunchrun/docker.go index dde96b08e7..eee8f1d76a 100644 --- a/lib/crunchrun/docker.go +++ b/lib/crunchrun/docker.go @@ -49,7 +49,20 @@ func newDockerExecutor(containerUUID string, logf func(string, ...interface{}), }, err } -func (e *dockerExecutor) Runtime() string { return "docker" } +func (e *dockerExecutor) Runtime() string { + v, _ := e.dockerclient.ServerVersion(context.Background()) + info := "" + for _, cv := range v.Components { + if info != "" { + info += ", " + } + info += cv.Name + " " + cv.Version + } + if info == "" { + info = "(unknown version)" + } + return "docker " + info +} func (e *dockerExecutor) LoadImage(imageID string, imageTarballPath string, container arvados.Container, arvMountPoint string, containerClient *arvados.Client) error {