githubfoam
diff --git a/‎client/allocrunner/taskrunner/task_runner.go
Lines changed: 1 addition & 0 deletions b/‎client/allocrunner/taskrunner/task_runner.go
Lines changed: 1 addition & 0 deletions
diff --git a/‎drivers/rkt/driver.go
Lines changed: 4 additions & 4 deletions b/‎drivers/rkt/driver.go
Lines changed: 4 additions & 4 deletions
diff --git a/‎plugins/drivers/driver.go
Lines changed: 1 addition & 0 deletions b/‎plugins/drivers/driver.go
Lines changed: 1 addition & 0 deletions
@@ -688,6 +688,7 @@ func (tr *TaskRunner) buildTaskConfig() *drivers.TaskConfig {
 		AllocDir:   tr.taskDir.AllocDir,
 		StdoutPath: tr.logmonHookConfig.stdoutFifo,
 		StderrPath: tr.logmonHookConfig.stderrFifo,
+		AllocID:    tr.allocID,
 	}
 }
 
 
@@ -446,17 +446,17 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *cstru
 	sanitizedName := strings.Replace(cfg.Name, "_", "-", -1)
 
 	// Mount /alloc
-	allocVolName := fmt.Sprintf("%s-%s-alloc", cfg.ID, sanitizedName)
+	allocVolName := fmt.Sprintf("%s-%s-alloc", cfg.AllocID, sanitizedName)
 	prepareArgs = append(prepareArgs, fmt.Sprintf("--volume=%s,kind=host,source=%s", allocVolName, cfg.TaskDir().SharedAllocDir))
 	prepareArgs = append(prepareArgs, fmt.Sprintf("--mount=volume=%s,target=%s", allocVolName, "/alloc"))
 
 	// Mount /local
-	localVolName := fmt.Sprintf("%s-%s-local", cfg.ID, sanitizedName)
+	localVolName := fmt.Sprintf("%s-%s-local", cfg.AllocID, sanitizedName)
 	prepareArgs = append(prepareArgs, fmt.Sprintf("--volume=%s,kind=host,source=%s", localVolName, cfg.TaskDir().LocalDir))
 	prepareArgs = append(prepareArgs, fmt.Sprintf("--mount=volume=%s,target=%s", localVolName, "/local"))
 
 	// Mount /secrets
-	secretsVolName := fmt.Sprintf("%s-%s-secrets", cfg.ID, sanitizedName)
+	secretsVolName := fmt.Sprintf("%s-%s-secrets", cfg.AllocID, sanitizedName)
 	prepareArgs = append(prepareArgs, fmt.Sprintf("--volume=%s,kind=host,source=%s", secretsVolName, cfg.TaskDir().SecretsDir))
 	prepareArgs = append(prepareArgs, fmt.Sprintf("--mount=volume=%s,target=%s", secretsVolName, "/secrets"))
 
@@ -481,7 +481,7 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *cstru
 			} else if len(parts) != 2 {
 				return nil, nil, fmt.Errorf("invalid rkt volume: %q", rawvol)
 			}
-			volName := fmt.Sprintf("%s-%s-%d", cfg.ID, sanitizedName, i)
+			volName := fmt.Sprintf("%s-%s-%d", cfg.AllocID, sanitizedName, i)
 			prepareArgs = append(prepareArgs, fmt.Sprintf("--volume=%s,kind=host,source=%s,readOnly=%s", volName, parts[0], readOnly))
 			prepareArgs = append(prepareArgs, fmt.Sprintf("--mount=volume=%s,target=%s", volName, parts[1]))
 		}
 
@@ -115,6 +115,7 @@ type TaskConfig struct {
 	rawDriverConfig []byte
 	StdoutPath      string
 	StderrPath      string
+	AllocID         string
 }
 
 func (tc *TaskConfig) Copy() *TaskConfig {
Original file line number	Diff line number	Diff line change
`@@ -688,6 +688,7 @@ func (tr TaskRunner) buildTaskConfig() drivers.TaskConfig {`
`688`	`688`	`AllocDir: tr.taskDir.AllocDir,`
`689`	`689`	`StdoutPath: tr.logmonHookConfig.stdoutFifo,`
`690`	`690`	`StderrPath: tr.logmonHookConfig.stderrFifo,`
	`691`	`+ AllocID: tr.allocID,`
`691`	`692`	`}`
`692`	`693`	`}`
`693`	`694`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ type TaskConfig struct {`
`115`	`115`	`rawDriverConfig []byte`
`116`	`116`	`StdoutPath string`
`117`	`117`	`StderrPath string`
	`118`	`+ AllocID string`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`func (tc TaskConfig) Copy() TaskConfig {`