WithRuntimePath uses the TaskInfo.RuntimePath field

Iceber · Iceber · commit 97064b0772af · 2023-03-29T11:34:50.000+08:00
Signed-off-by: Iceber Gu &lt;wei.cai-nat@daocloud.io&gt;
diff --git a/container.go b/container.go
@@ -281,6 +281,7 @@ func (c *container) NewTask(ctx context.Context, ioCreate cio.Creator, opts ...N
 			})
 		}
 	}
+	request.RuntimePath = info.RuntimePath
 	if info.Options != nil {
 		any, err := typeurl.MarshalAny(info.Options)
 		if err != nil {
diff --git a/task.go b/task.go
@@ -139,6 +139,11 @@ type TaskInfo struct {
 	RootFS []mount.Mount
 	// Options hold runtime specific settings for task creation
 	Options interface{}
+	// RuntimePath is an absolute path that can be used to overwrite path
+	// to a shim runtime binary.
+	RuntimePath string
+
+	// runtime is the runtime name for the container, and cannot be changed.
 	runtime string
 }
 
diff --git a/task_opts.go b/task_opts.go
@@ -48,7 +48,7 @@ func WithRootFS(mounts []mount.Mount) NewTaskOpts {
 // instead of resolving it from runtime name.
 func WithRuntimePath(absRuntimePath string) NewTaskOpts {
 	return func(ctx context.Context, client *Client, info *TaskInfo) error {
-		info.runtime = absRuntimePath
+		info.RuntimePath = absRuntimePath
 		return nil
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,7 @@ func (c *container) NewTask(ctx context.Context, ioCreate cio.Creator, opts ...N`
`281`	`281`	`})`
`282`	`282`	`}`
`283`	`283`	`}`
	`284`	`+ request.RuntimePath = info.RuntimePath`
`284`	`285`	`if info.Options != nil {`
`285`	`286`	`any, err := typeurl.MarshalAny(info.Options)`
`286`	`287`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func WithRootFS(mounts []mount.Mount) NewTaskOpts {`
`48`	`48`	`// instead of resolving it from runtime name.`
`49`	`49`	`func WithRuntimePath(absRuntimePath string) NewTaskOpts {`
`50`	`50`	`return func(ctx context.Context, client Client, info TaskInfo) error {`
`51`		`- info.runtime = absRuntimePath`
	`51`	`+ info.RuntimePath = absRuntimePath`
`52`	`52`	`return nil`
`53`	`53`	`}`
`54`	`54`	`}`