X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7c5a4e0eb8529c7bf19a67ac85e52f61dff4ceb0..c92af4dedd8f2bcc0dfcc2f6e052e850341f8a5e:/lib/crunchrun/copier.go

diff --git a/lib/crunchrun/copier.go b/lib/crunchrun/copier.go
index 132101028e..72c714dfa4 100644
--- a/lib/crunchrun/copier.go
+++ b/lib/crunchrun/copier.go
@@ -55,7 +55,7 @@ type copier struct {
 	keepClient    IKeepClient
 	hostOutputDir string
 	ctrOutputDir  string
-	binds         []string
+	bindmounts    map[string]bindmount
 	mounts        map[string]arvados.Mount
 	secretMounts  map[string]arvados.Mount
 	logger        printfer
@@ -341,11 +341,8 @@ func (cp *copier) hostRoot(ctrRoot string) (string, error) {
 	if ctrRoot == cp.ctrOutputDir {
 		return cp.hostOutputDir, nil
 	}
-	for _, bind := range cp.binds {
-		tokens := strings.Split(bind, ":")
-		if len(tokens) >= 2 && tokens[1] == ctrRoot {
-			return tokens[0], nil
-		}
+	if mnt, ok := cp.bindmounts[ctrRoot]; ok {
+		return mnt.HostPath, nil
 	}
 	return "", fmt.Errorf("not bind-mounted: %q", ctrRoot)
 }