Merge pull request #4778 from tonistiigi/otel-mount-source-check

oci: make mounting oci socket optional
moby · Mar 18, 2024 · 6e48182 · 6e48182
2 parents eb41916 + 33b347a
commit 6e48182
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/executor/oci/spec.go b/executor/oci/spec.go
@@ -2,6 +2,7 @@ package oci
 
 import (
 	"context"
+	"os"
 	"path"
 	"path/filepath"
 	"runtime"
@@ -197,8 +198,11 @@ func GenerateSpec(ctx context.Context, meta executor.Meta, mounts []executor.Mou
 	}
 
 	if tracingSocket != "" {
-		if mount := getTracingSocketMount(tracingSocket); mount != nil {
-			s.Mounts = append(s.Mounts, *mount)
+		// moby/buildkit#4764
+		if _, err := os.Stat(tracingSocket); err == nil {
+			if mount := getTracingSocketMount(tracingSocket); mount != nil {
+				s.Mounts = append(s.Mounts, *mount)
+			}
 		}
 	}