diff --git a/builder/builder-next/controller.go b/builder/builder-next/controller.go index c84f788bc3..d21d88eeac 100644 --- a/builder/builder-next/controller.go +++ b/builder/builder-next/controller.go @@ -19,6 +19,7 @@ import ( "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" + wlabel "github.com/docker/docker/builder/builder-next/worker/label" "github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/graphdriver" units "github.com/docker/go-units" @@ -95,6 +96,7 @@ func newSnapshotterController(ctx context.Context, rt http.RoundTripper, opt Opt wo.GCPolicy = policy wo.RegistryHosts = opt.RegistryHosts + wo.Labels = getLabels(opt, wo.Labels) exec, err := newExecutor(opt.Root, opt.DefaultCgroupParent, opt.NetworkController, dns, opt.Rootless, opt.IdentityMapping, opt.ApparmorProfile) if err != nil { @@ -325,6 +327,7 @@ func newGraphDriverController(ctx context.Context, rt http.RoundTripper, opt Opt Layers: layers, Platforms: archutil.SupportedPlatforms(true), LeaseManager: lm, + Labels: getLabels(opt, nil), } wc := &worker.Controller{} @@ -411,3 +414,11 @@ func getEntitlements(conf config.BuilderConfig) []string { } return ents } + +func getLabels(opt Opt, labels map[string]string) map[string]string { + if labels == nil { + labels = make(map[string]string) + } + labels[wlabel.HostGatewayIP] = opt.DNSConfig.HostGatewayIP.String() + return labels +} diff --git a/builder/builder-next/worker/label/label.go b/builder/builder-next/worker/label/label.go new file mode 100644 index 0000000000..f879720f81 --- /dev/null +++ b/builder/builder-next/worker/label/label.go @@ -0,0 +1,9 @@ +package label + +// Pre-defined label keys similar to BuildKit ones +// https://github.com/moby/buildkit/blob/v0.11.6/worker/label/label.go#L3-L16 +const ( + prefix = "org.mobyproject.buildkit.worker.moby." + + HostGatewayIP = prefix + "host-gateway-ip" +)