From 6d139e5e950c04325fc91e774ea66dc8b5518288 Mon Sep 17 00:00:00 2001
From: Kevin Alvarez <crazy-max@users.noreply.github.com>
Date: Thu, 18 May 2023 21:17:22 +0200
Subject: [PATCH] build: use daemon id as worker id for the graph driver
 controller

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
---
 builder/builder-next/builder.go    | 1 +
 builder/builder-next/controller.go | 3 +--
 cmd/dockerd/daemon.go              | 1 +
 daemon/daemon.go                   | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/builder/builder-next/builder.go b/builder/builder-next/builder.go
index a262da7fcc..f6a89633e6 100644
--- a/builder/builder-next/builder.go
+++ b/builder/builder-next/builder.go
@@ -78,6 +78,7 @@ var cacheFields = map[string]bool{
 type Opt struct {
 	SessionManager      *session.Manager
 	Root                string
+	EngineID            string
 	Dist                images.DistributionServices
 	ImageTagger         mobyexporter.ImageTagger
 	NetworkController   *libnetwork.Controller
diff --git a/builder/builder-next/controller.go b/builder/builder-next/controller.go
index c1a419e322..c84f788bc3 100644
--- a/builder/builder-next/controller.go
+++ b/builder/builder-next/controller.go
@@ -16,7 +16,6 @@ import (
 	"github.com/docker/docker/builder/builder-next/adapters/containerimage"
 	"github.com/docker/docker/builder/builder-next/adapters/localinlinecache"
 	"github.com/docker/docker/builder/builder-next/adapters/snapshot"
-	"github.com/docker/docker/builder/builder-next/exporter"
 	"github.com/docker/docker/builder/builder-next/exporter/mobyexporter"
 	"github.com/docker/docker/builder/builder-next/imagerefchecker"
 	mobyworker "github.com/docker/docker/builder/builder-next/worker"
@@ -312,7 +311,7 @@ func newGraphDriverController(ctx context.Context, rt http.RoundTripper, opt Opt
 	}
 
 	wopt := mobyworker.Opt{
-		ID:                exporter.Moby,
+		ID:                opt.EngineID,
 		ContentStore:      store,
 		CacheManager:      cm,
 		GCPolicy:          gcPolicy,
diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go
index ebfa858207..a3b1e7351e 100644
--- a/cmd/dockerd/daemon.go
+++ b/cmd/dockerd/daemon.go
@@ -351,6 +351,7 @@ func newRouterOptions(ctx context.Context, config *config.Config, d *daemon.Daem
 	bk, err := buildkit.New(ctx, buildkit.Opt{
 		SessionManager:      sm,
 		Root:                filepath.Join(config.Root, "buildkit"),
+		EngineID:            d.ID(),
 		Dist:                d.DistributionServices(),
 		ImageTagger:         d.ImageService(),
 		NetworkController:   d.NetworkController(),
diff --git a/daemon/daemon.go b/daemon/daemon.go
index 597bf50ee4..c2c4704aa9 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -131,6 +131,11 @@ type Daemon struct {
 	mdDB *bbolt.DB
 }
 
+// ID returns the daemon id
+func (daemon *Daemon) ID() string {
+	return daemon.id
+}
+
 // StoreHosts stores the addresses the daemon is listening on
 func (daemon *Daemon) StoreHosts(hosts []string) {
 	if daemon.hosts == nil {