X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f6e8752348958e3bb48c7509a4ff78689f2d64c9..13f6d45704efc68ca8419e8917376aa44fdee1be:/lib/crunchrun/crunchrun.go

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index 474fbf4ade..30871e7349 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -422,7 +422,7 @@ func (runner *ContainerRunner) SetupMounts() (map[string]bindmount, error) {
 		"--storage-classes", strings.Join(runner.Container.OutputStorageClasses, ","),
 		fmt.Sprintf("--crunchstat-interval=%v", runner.statInterval.Seconds())}
 
-	if runner.executor.Runtime() == "docker" {
+	if _, isdocker := runner.executor.(*dockerExecutor); isdocker {
 		arvMountCmd = append(arvMountCmd, "--allow-other")
 	}
 
@@ -1479,7 +1479,10 @@ func (runner *ContainerRunner) NewArvLogWriter(name string) (io.WriteCloser, err
 func (runner *ContainerRunner) Run() (err error) {
 	runner.CrunchLog.Printf("crunch-run %s started", cmd.Version.String())
 	runner.CrunchLog.Printf("%s", currentUserAndGroups())
-	runner.CrunchLog.Printf("Executing container '%s' using %s runtime", runner.Container.UUID, runner.executor.Runtime())
+	v, _ := exec.Command("arv-mount", "--version").CombinedOutput()
+	runner.CrunchLog.Printf("Using FUSE mount: %s", v)
+	runner.CrunchLog.Printf("Using container runtime: %s", runner.executor.Runtime())
+	runner.CrunchLog.Printf("Executing container: %s", runner.Container.UUID)
 
 	hostname, hosterr := os.Hostname()
 	if hosterr != nil {
@@ -1901,14 +1904,13 @@ func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, s
 		// dispatcher did not tell us which external IP
 		// address to advertise --> no gateway service
 		cr.CrunchLog.Printf("Not starting a gateway server (GatewayAddress was not provided by dispatcher)")
-	} else if de, ok := cr.executor.(*dockerExecutor); ok {
+	} else {
 		cr.gateway = Gateway{
-			Address:            gwListen,
-			AuthSecret:         gwAuthSecret,
-			ContainerUUID:      containerUUID,
-			DockerContainerID:  &de.containerID,
-			Log:                cr.CrunchLog,
-			ContainerIPAddress: dockerContainerIPAddress(&de.containerID),
+			Address:       gwListen,
+			AuthSecret:    gwAuthSecret,
+			ContainerUUID: containerUUID,
+			Target:        cr.executor,
+			Log:           cr.CrunchLog,
 		}
 		err = cr.gateway.Start()
 		if err != nil {