InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move builder/builder-next to daemon/internal/builder-next

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2025-07-16 15:05:44 -07:00
parent 7766b8a763
commit 6ff9bea6a7
27 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/build/backend.go
View File

@@ -10,8 +10,8 @@ import (
"github.com/docker/docker/api/types/build"
"github.com/docker/docker/api/types/events"
"github.com/docker/docker/builder"
buildkit "github.com/docker/docker/builder/builder-next"
daemonevents "github.com/docker/docker/daemon/events"
buildkit "github.com/docker/docker/daemon/internal/builder-next"
"github.com/docker/docker/image"
"github.com/docker/docker/pkg/stringid"
"github.com/pkg/errors"

4
daemon/command/daemon.go
View File

@@ -19,8 +19,6 @@ import (
"github.com/containerd/containerd/v2/pkg/tracing"
"github.com/containerd/log"
"github.com/docker/docker/api"
buildkit "github.com/docker/docker/builder/builder-next"
"github.com/docker/docker/builder/builder-next/exporter"
"github.com/docker/docker/builder/dockerfile"
"github.com/docker/docker/daemon"
buildbackend "github.com/docker/docker/daemon/build"
@@ -28,6 +26,8 @@ import (
"github.com/docker/docker/daemon/command/debug"
"github.com/docker/docker/daemon/command/trap"
"github.com/docker/docker/daemon/config"
buildkit "github.com/docker/docker/daemon/internal/builder-next"
"github.com/docker/docker/daemon/internal/builder-next/exporter"
"github.com/docker/docker/daemon/internal/libcontainerd/supervisor"
"github.com/docker/docker/daemon/listeners"
dopts "github.com/docker/docker/daemon/pkg/opts"

0
builder/builder-next/adapters/containerimage/pull.go → daemon/internal/builder-next/adapters/containerimage/pull.go
View File

0
builder/builder-next/adapters/localinlinecache/inlinecache.go → daemon/internal/builder-next/adapters/localinlinecache/inlinecache.go
View File

0
builder/builder-next/adapters/snapshot/layer.go → daemon/internal/builder-next/adapters/snapshot/layer.go
View File

0
builder/builder-next/adapters/snapshot/leasemanager.go → daemon/internal/builder-next/adapters/snapshot/leasemanager.go
View File

0
builder/builder-next/adapters/snapshot/snapshot.go → daemon/internal/builder-next/adapters/snapshot/snapshot.go
View File

6
builder/builder-next/builder.go → daemon/internal/builder-next/builder.go
View File

@@ -18,11 +18,11 @@ import (
"github.com/docker/docker/api/types/network"
timetypes "github.com/docker/docker/api/types/time"
"github.com/docker/docker/builder"
"github.com/docker/docker/builder/builder-next/exporter"
"github.com/docker/docker/builder/builder-next/exporter/mobyexporter"
"github.com/docker/docker/builder/builder-next/exporter/overrides"
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/daemon/images"
"github.com/docker/docker/daemon/internal/builder-next/exporter"
"github.com/docker/docker/daemon/internal/builder-next/exporter/mobyexporter"
"github.com/docker/docker/daemon/internal/builder-next/exporter/overrides"
"github.com/docker/docker/daemon/libnetwork"
"github.com/docker/docker/daemon/pkg/opts"
"github.com/docker/docker/errdefs"

14
builder/builder-next/controller.go → daemon/internal/builder-next/controller.go
View File

@@ -18,15 +18,15 @@ import (
"github.com/containerd/platforms"
"github.com/docker/docker/api/types/build"
"github.com/docker/docker/api/types/filters"
"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/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"
"github.com/docker/docker/daemon/internal/builder-next/adapters/containerimage"
"github.com/docker/docker/daemon/internal/builder-next/adapters/localinlinecache"
"github.com/docker/docker/daemon/internal/builder-next/adapters/snapshot"
"github.com/docker/docker/daemon/internal/builder-next/exporter/mobyexporter"
"github.com/docker/docker/daemon/internal/builder-next/imagerefchecker"
mobyworker "github.com/docker/docker/daemon/internal/builder-next/worker"
wlabel "github.com/docker/docker/daemon/internal/builder-next/worker/label"
"github.com/docker/go-units"
"github.com/moby/buildkit/cache"
"github.com/moby/buildkit/cache/metadata"

0
builder/builder-next/executor.go → daemon/internal/builder-next/executor.go
View File

0
builder/builder-next/executor_linux.go → daemon/internal/builder-next/executor_linux.go
View File

0
builder/builder-next/executor_nolinux.go → daemon/internal/builder-next/executor_nolinux.go
View File

0
builder/builder-next/executor_others.go → daemon/internal/builder-next/executor_others.go
View File

0
builder/builder-next/executor_windows.go → daemon/internal/builder-next/executor_windows.go
View File

0
builder/builder-next/exporter/exporter.go → daemon/internal/builder-next/exporter/exporter.go
View File

0
builder/builder-next/exporter/mobyexporter/export.go → daemon/internal/builder-next/exporter/mobyexporter/export.go
View File

0
builder/builder-next/exporter/mobyexporter/writer.go → daemon/internal/builder-next/exporter/mobyexporter/writer.go
View File

0
builder/builder-next/exporter/mobyexporter/writer_test.go → daemon/internal/builder-next/exporter/mobyexporter/writer_test.go
View File

0
builder/builder-next/exporter/overrides/overrides.go → daemon/internal/builder-next/exporter/overrides/overrides.go
View File

2
builder/builder-next/exporter/wrapper.go → daemon/internal/builder-next/exporter/wrapper.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/containerd/log"
"github.com/distribution/reference"
"github.com/docker/docker/builder/builder-next/exporter/overrides"
"github.com/docker/docker/daemon/internal/builder-next/exporter/overrides"
"github.com/moby/buildkit/exporter"
"github.com/moby/buildkit/exporter/containerimage/exptypes"

0
builder/builder-next/imagerefchecker/checker.go → daemon/internal/builder-next/imagerefchecker/checker.go
View File

0
builder/builder-next/reqbodyhandler.go → daemon/internal/builder-next/reqbodyhandler.go
View File

2
builder/builder-next/worker/containerdworker.go → daemon/internal/builder-next/worker/containerdworker.go
View File

@@ -5,7 +5,7 @@ import (
nethttp "net/http"
"github.com/containerd/log"
"github.com/docker/docker/builder/builder-next/exporter"
"github.com/docker/docker/daemon/internal/builder-next/exporter"
"github.com/moby/buildkit/client"
bkexporter "github.com/moby/buildkit/exporter"
"github.com/moby/buildkit/session"

0
builder/builder-next/worker/gc.go → daemon/internal/builder-next/worker/gc.go
View File

0
builder/builder-next/worker/label/label.go → daemon/internal/builder-next/worker/label/label.go
View File

4
builder/builder-next/worker/worker.go → daemon/internal/builder-next/worker/worker.go
View File

@@ -14,8 +14,8 @@ import (
cerrdefs "github.com/containerd/errdefs"
"github.com/containerd/log"
"github.com/containerd/platforms"
imageadapter "github.com/docker/docker/builder/builder-next/adapters/containerimage"
mobyexporter "github.com/docker/docker/builder/builder-next/exporter"
imageadapter "github.com/docker/docker/daemon/internal/builder-next/adapters/containerimage"
mobyexporter "github.com/docker/docker/daemon/internal/builder-next/exporter"
distmetadata "github.com/docker/docker/distribution/metadata"
"github.com/docker/docker/distribution/xfer"
"github.com/docker/docker/internal/mod"

0
builder/builder-next/worker/worker_test.go → daemon/internal/builder-next/worker/worker_test.go
View File