avoid duplicate mounts

johnstcn · johnstcn · commit 646ca60b944e · 2025-03-06T11:00:06.000Z
diff --git a/cli/docker.go b/cli/docker.go
@@ -628,6 +628,13 @@ func runDockerCVM(ctx context.Context, log slog.Logger, client dockerutil.Client
 					strings.TrimPrefix(mountpoint, strings.TrimSuffix(flags.hostUsrLibDir, "/")),
 				)
 			}
+			// Avoid duplicate mounts.
+			if slices.ContainsFunc(mounts, func(m xunix.Mount) bool {
+				return m.Mountpoint == mountpoint
+			}) {
+				log.Debug(ctx, "skipping duplicate mount", slog.F("path", mountpoint))
+				continue
+			}
 			mounts = append(mounts, xunix.Mount{
 				Source:     bind.Path,
 				Mountpoint: mountpoint,

Original file line number	Diff line number	Diff line change
`@@ -628,6 +628,13 @@ func runDockerCVM(ctx context.Context, log slog.Logger, client dockerutil.Client`
`628`	`628`	`strings.TrimPrefix(mountpoint, strings.TrimSuffix(flags.hostUsrLibDir, "/")),`
`629`	`629`	`)`
`630`	`630`	`}`
	`631`	`+ // Avoid duplicate mounts.`
	`632`	`+ if slices.ContainsFunc(mounts, func(m xunix.Mount) bool {`
	`633`	`+ return m.Mountpoint == mountpoint`
	`634`	`+ }) {`
	`635`	`+ log.Debug(ctx, "skipping duplicate mount", slog.F("path", mountpoint))`
	`636`	`+ continue`
	`637`	`+ }`
`631`	`638`	`mounts = append(mounts, xunix.Mount{`
`632`	`639`	`Source: bind.Path,`
`633`	`640`	`Mountpoint: mountpoint,`