diff --git a/daemon/build/backend.go b/daemon/build/backend.go index dfc4c04f1e..6b48b1f7f6 100644 --- a/daemon/build/backend.go +++ b/daemon/build/backend.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/build" "github.com/docker/docker/api/types/events" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" daemonevents "github.com/docker/docker/daemon/events" buildkit "github.com/docker/docker/daemon/internal/builder-next" "github.com/docker/docker/image" diff --git a/builder/builder.go b/daemon/builder/builder.go similarity index 100% rename from builder/builder.go rename to daemon/builder/builder.go diff --git a/builder/dockerfile/buildargs.go b/daemon/builder/dockerfile/buildargs.go similarity index 100% rename from builder/dockerfile/buildargs.go rename to daemon/builder/dockerfile/buildargs.go diff --git a/builder/dockerfile/buildargs_test.go b/daemon/builder/dockerfile/buildargs_test.go similarity index 100% rename from builder/dockerfile/buildargs_test.go rename to daemon/builder/dockerfile/buildargs_test.go diff --git a/builder/dockerfile/builder.go b/daemon/builder/dockerfile/builder.go similarity index 99% rename from builder/dockerfile/builder.go rename to daemon/builder/dockerfile/builder.go index 1ccc4a4f7b..f9a1204f0c 100644 --- a/builder/dockerfile/builder.go +++ b/daemon/builder/dockerfile/builder.go @@ -13,8 +13,8 @@ import ( "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/build" "github.com/docker/docker/api/types/container" - "github.com/docker/docker/builder" - "github.com/docker/docker/builder/remotecontext" + "github.com/docker/docker/daemon/builder" + "github.com/docker/docker/daemon/builder/remotecontext" "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/stringid" "github.com/moby/buildkit/frontend/dockerfile/instructions" diff --git a/builder/dockerfile/builder_unix.go b/daemon/builder/dockerfile/builder_unix.go similarity index 100% rename from builder/dockerfile/builder_unix.go rename to daemon/builder/dockerfile/builder_unix.go diff --git a/builder/dockerfile/builder_windows.go b/daemon/builder/dockerfile/builder_windows.go similarity index 100% rename from builder/dockerfile/builder_windows.go rename to daemon/builder/dockerfile/builder_windows.go diff --git a/builder/dockerfile/containerbackend.go b/daemon/builder/dockerfile/containerbackend.go similarity index 98% rename from builder/dockerfile/containerbackend.go rename to daemon/builder/dockerfile/containerbackend.go index d5c5a876a7..73d303166b 100644 --- a/builder/dockerfile/containerbackend.go +++ b/daemon/builder/dockerfile/containerbackend.go @@ -9,7 +9,7 @@ import ( "github.com/containerd/log" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/pkg/stringid" "github.com/pkg/errors" ) diff --git a/builder/dockerfile/copy.go b/daemon/builder/dockerfile/copy.go similarity index 98% rename from builder/dockerfile/copy.go rename to daemon/builder/dockerfile/copy.go index a344e3991d..c4789227f4 100644 --- a/builder/dockerfile/copy.go +++ b/daemon/builder/dockerfile/copy.go @@ -14,9 +14,9 @@ import ( "time" "github.com/containerd/log" - "github.com/docker/docker/builder" - "github.com/docker/docker/builder/remotecontext" - "github.com/docker/docker/builder/remotecontext/urlutil" + "github.com/docker/docker/daemon/builder" + "github.com/docker/docker/daemon/builder/remotecontext" + "github.com/docker/docker/daemon/builder/remotecontext/urlutil" "github.com/docker/docker/pkg/longpath" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/streamformatter" diff --git a/builder/dockerfile/copy_test.go b/daemon/builder/dockerfile/copy_test.go similarity index 100% rename from builder/dockerfile/copy_test.go rename to daemon/builder/dockerfile/copy_test.go diff --git a/builder/dockerfile/copy_unix.go b/daemon/builder/dockerfile/copy_unix.go similarity index 100% rename from builder/dockerfile/copy_unix.go rename to daemon/builder/dockerfile/copy_unix.go diff --git a/builder/dockerfile/copy_windows.go b/daemon/builder/dockerfile/copy_windows.go similarity index 100% rename from builder/dockerfile/copy_windows.go rename to daemon/builder/dockerfile/copy_windows.go diff --git a/builder/dockerfile/dispatchers.go b/daemon/builder/dockerfile/dispatchers.go similarity index 99% rename from builder/dockerfile/dispatchers.go rename to daemon/builder/dockerfile/dispatchers.go index f9d87dce5f..9d332f7c81 100644 --- a/builder/dockerfile/dispatchers.go +++ b/daemon/builder/dockerfile/dispatchers.go @@ -17,7 +17,7 @@ import ( "github.com/containerd/platforms" "github.com/docker/docker/api" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/errdefs" "github.com/docker/docker/image" "github.com/docker/docker/pkg/jsonmessage" diff --git a/builder/dockerfile/dispatchers_test.go b/daemon/builder/dockerfile/dispatchers_test.go similarity index 99% rename from builder/dockerfile/dispatchers_test.go rename to daemon/builder/dockerfile/dispatchers_test.go index 8a41282174..716cc1a028 100644 --- a/builder/dockerfile/dispatchers_test.go +++ b/daemon/builder/dockerfile/dispatchers_test.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/build" "github.com/docker/docker/api/types/container" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/image" "github.com/docker/docker/oci" "github.com/docker/go-connections/nat" diff --git a/builder/dockerfile/dispatchers_unix.go b/daemon/builder/dockerfile/dispatchers_unix.go similarity index 100% rename from builder/dockerfile/dispatchers_unix.go rename to daemon/builder/dockerfile/dispatchers_unix.go diff --git a/builder/dockerfile/dispatchers_unix_test.go b/daemon/builder/dockerfile/dispatchers_unix_test.go similarity index 100% rename from builder/dockerfile/dispatchers_unix_test.go rename to daemon/builder/dockerfile/dispatchers_unix_test.go diff --git a/builder/dockerfile/dispatchers_windows.go b/daemon/builder/dockerfile/dispatchers_windows.go similarity index 100% rename from builder/dockerfile/dispatchers_windows.go rename to daemon/builder/dockerfile/dispatchers_windows.go diff --git a/builder/dockerfile/dispatchers_windows_test.go b/daemon/builder/dockerfile/dispatchers_windows_test.go similarity index 100% rename from builder/dockerfile/dispatchers_windows_test.go rename to daemon/builder/dockerfile/dispatchers_windows_test.go diff --git a/builder/dockerfile/evaluator.go b/daemon/builder/dockerfile/evaluator.go similarity index 99% rename from builder/dockerfile/evaluator.go rename to daemon/builder/dockerfile/evaluator.go index 40e7e35a04..b772ee8cfd 100644 --- a/builder/dockerfile/evaluator.go +++ b/daemon/builder/dockerfile/evaluator.go @@ -26,7 +26,7 @@ import ( "strings" "github.com/docker/docker/api/types/container" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/errdefs" "github.com/docker/docker/image" "github.com/docker/docker/oci" diff --git a/builder/dockerfile/evaluator_test.go b/daemon/builder/dockerfile/evaluator_test.go similarity index 98% rename from builder/dockerfile/evaluator_test.go rename to daemon/builder/dockerfile/evaluator_test.go index ccf36b41bc..90a7830919 100644 --- a/builder/dockerfile/evaluator_test.go +++ b/daemon/builder/dockerfile/evaluator_test.go @@ -6,7 +6,7 @@ import ( "runtime" "testing" - "github.com/docker/docker/builder/remotecontext" + "github.com/docker/docker/daemon/builder/remotecontext" "github.com/moby/buildkit/frontend/dockerfile/instructions" "github.com/moby/go-archive" "github.com/moby/sys/reexec" diff --git a/builder/dockerfile/imagecontext.go b/daemon/builder/dockerfile/imagecontext.go similarity index 98% rename from builder/dockerfile/imagecontext.go rename to daemon/builder/dockerfile/imagecontext.go index 4f8a937b3d..57366d9e93 100644 --- a/builder/dockerfile/imagecontext.go +++ b/daemon/builder/dockerfile/imagecontext.go @@ -7,7 +7,7 @@ import ( "github.com/containerd/log" "github.com/containerd/platforms" "github.com/docker/docker/api/types/backend" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" dockerimage "github.com/docker/docker/image" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" diff --git a/builder/dockerfile/imagecontext_test.go b/daemon/builder/dockerfile/imagecontext_test.go similarity index 98% rename from builder/dockerfile/imagecontext_test.go rename to daemon/builder/dockerfile/imagecontext_test.go index b14892673e..d5a5e1d15f 100644 --- a/builder/dockerfile/imagecontext_test.go +++ b/daemon/builder/dockerfile/imagecontext_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/containerd/platforms" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/image" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" diff --git a/builder/dockerfile/imageprobe.go b/daemon/builder/dockerfile/imageprobe.go similarity index 97% rename from builder/dockerfile/imageprobe.go rename to daemon/builder/dockerfile/imageprobe.go index c02ec6f702..821f753aca 100644 --- a/builder/dockerfile/imageprobe.go +++ b/daemon/builder/dockerfile/imageprobe.go @@ -5,7 +5,7 @@ import ( "github.com/containerd/log" "github.com/docker/docker/api/types/container" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/builder/dockerfile/internals.go b/daemon/builder/dockerfile/internals.go similarity index 99% rename from builder/dockerfile/internals.go rename to daemon/builder/dockerfile/internals.go index 83de7c54e2..1d217f3b81 100644 --- a/builder/dockerfile/internals.go +++ b/daemon/builder/dockerfile/internals.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/api/types/build" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" networkSettings "github.com/docker/docker/daemon/network" "github.com/docker/docker/image" "github.com/docker/docker/pkg/stringid" diff --git a/builder/dockerfile/internals_linux.go b/daemon/builder/dockerfile/internals_linux.go similarity index 100% rename from builder/dockerfile/internals_linux.go rename to daemon/builder/dockerfile/internals_linux.go diff --git a/builder/dockerfile/internals_linux_test.go b/daemon/builder/dockerfile/internals_linux_test.go similarity index 100% rename from builder/dockerfile/internals_linux_test.go rename to daemon/builder/dockerfile/internals_linux_test.go diff --git a/builder/dockerfile/internals_test.go b/daemon/builder/dockerfile/internals_test.go similarity index 98% rename from builder/dockerfile/internals_test.go rename to daemon/builder/dockerfile/internals_test.go index 7c77625f8f..5806b5da0d 100644 --- a/builder/dockerfile/internals_test.go +++ b/daemon/builder/dockerfile/internals_test.go @@ -10,8 +10,8 @@ import ( "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/build" "github.com/docker/docker/api/types/container" - "github.com/docker/docker/builder" - "github.com/docker/docker/builder/remotecontext" + "github.com/docker/docker/daemon/builder" + "github.com/docker/docker/daemon/builder/remotecontext" "github.com/docker/docker/image" "github.com/docker/docker/layer" "github.com/docker/go-connections/nat" diff --git a/builder/dockerfile/internals_windows.go b/daemon/builder/dockerfile/internals_windows.go similarity index 100% rename from builder/dockerfile/internals_windows.go rename to daemon/builder/dockerfile/internals_windows.go diff --git a/builder/dockerfile/internals_windows_test.go b/daemon/builder/dockerfile/internals_windows_test.go similarity index 100% rename from builder/dockerfile/internals_windows_test.go rename to daemon/builder/dockerfile/internals_windows_test.go diff --git a/builder/dockerfile/metrics.go b/daemon/builder/dockerfile/metrics.go similarity index 100% rename from builder/dockerfile/metrics.go rename to daemon/builder/dockerfile/metrics.go diff --git a/builder/dockerfile/mockbackend_test.go b/daemon/builder/dockerfile/mockbackend_test.go similarity index 98% rename from builder/dockerfile/mockbackend_test.go rename to daemon/builder/dockerfile/mockbackend_test.go index 252ccb0298..59ffff9706 100644 --- a/builder/dockerfile/mockbackend_test.go +++ b/daemon/builder/dockerfile/mockbackend_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/image" "github.com/docker/docker/layer" "github.com/opencontainers/go-digest" diff --git a/builder/dockerfile/utils_test.go b/daemon/builder/dockerfile/utils_test.go similarity index 100% rename from builder/dockerfile/utils_test.go rename to daemon/builder/dockerfile/utils_test.go diff --git a/builder/remotecontext/archive.go b/daemon/builder/remotecontext/archive.go similarity index 98% rename from builder/remotecontext/archive.go rename to daemon/builder/remotecontext/archive.go index a46675ff67..5993da3052 100644 --- a/builder/remotecontext/archive.go +++ b/daemon/builder/remotecontext/archive.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/pkg/longpath" "github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/tarsum" diff --git a/builder/remotecontext/detect.go b/daemon/builder/remotecontext/detect.go similarity index 98% rename from builder/remotecontext/detect.go rename to daemon/builder/remotecontext/detect.go index 7bbc28072a..243bcb9bad 100644 --- a/builder/remotecontext/detect.go +++ b/daemon/builder/remotecontext/detect.go @@ -13,8 +13,8 @@ import ( "github.com/containerd/continuity/driver" "github.com/containerd/log" "github.com/docker/docker/api/types/backend" - "github.com/docker/docker/builder" - "github.com/docker/docker/builder/remotecontext/urlutil" + "github.com/docker/docker/daemon/builder" + "github.com/docker/docker/daemon/builder/remotecontext/urlutil" "github.com/docker/docker/errdefs" "github.com/moby/buildkit/frontend/dockerfile/parser" "github.com/moby/patternmatcher" diff --git a/builder/remotecontext/detect_test.go b/daemon/builder/remotecontext/detect_test.go similarity index 98% rename from builder/remotecontext/detect_test.go rename to daemon/builder/remotecontext/detect_test.go index 2ebbb78a90..aa893fee76 100644 --- a/builder/remotecontext/detect_test.go +++ b/daemon/builder/remotecontext/detect_test.go @@ -8,7 +8,7 @@ import ( "sort" "testing" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" ) const ( diff --git a/builder/remotecontext/filehash.go b/daemon/builder/remotecontext/filehash.go similarity index 100% rename from builder/remotecontext/filehash.go rename to daemon/builder/remotecontext/filehash.go diff --git a/builder/remotecontext/git.go b/daemon/builder/remotecontext/git.go similarity index 90% rename from builder/remotecontext/git.go rename to daemon/builder/remotecontext/git.go index a0804502d3..be8c4b1098 100644 --- a/builder/remotecontext/git.go +++ b/daemon/builder/remotecontext/git.go @@ -5,8 +5,8 @@ import ( "os" "github.com/containerd/log" - "github.com/docker/docker/builder" - "github.com/docker/docker/builder/remotecontext/git" + "github.com/docker/docker/daemon/builder" + "github.com/docker/docker/daemon/builder/remotecontext/git" "github.com/moby/go-archive" ) diff --git a/builder/remotecontext/git/gitutils.go b/daemon/builder/remotecontext/git/gitutils.go similarity index 100% rename from builder/remotecontext/git/gitutils.go rename to daemon/builder/remotecontext/git/gitutils.go diff --git a/builder/remotecontext/git/gitutils_test.go b/daemon/builder/remotecontext/git/gitutils_test.go similarity index 100% rename from builder/remotecontext/git/gitutils_test.go rename to daemon/builder/remotecontext/git/gitutils_test.go diff --git a/builder/remotecontext/lazycontext.go b/daemon/builder/remotecontext/lazycontext.go similarity index 98% rename from builder/remotecontext/lazycontext.go rename to daemon/builder/remotecontext/lazycontext.go index b0e8a2077d..6e9ac395d4 100644 --- a/builder/remotecontext/lazycontext.go +++ b/daemon/builder/remotecontext/lazycontext.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/pkg/pools" "github.com/pkg/errors" ) diff --git a/builder/remotecontext/mimetype.go b/daemon/builder/remotecontext/mimetype.go similarity index 100% rename from builder/remotecontext/mimetype.go rename to daemon/builder/remotecontext/mimetype.go diff --git a/builder/remotecontext/mimetype_test.go b/daemon/builder/remotecontext/mimetype_test.go similarity index 100% rename from builder/remotecontext/mimetype_test.go rename to daemon/builder/remotecontext/mimetype_test.go diff --git a/builder/remotecontext/remote.go b/daemon/builder/remotecontext/remote.go similarity index 100% rename from builder/remotecontext/remote.go rename to daemon/builder/remotecontext/remote.go diff --git a/builder/remotecontext/remote_test.go b/daemon/builder/remotecontext/remote_test.go similarity index 99% rename from builder/remotecontext/remote_test.go rename to daemon/builder/remotecontext/remote_test.go index b999b178ca..20fe86629b 100644 --- a/builder/remotecontext/remote_test.go +++ b/daemon/builder/remotecontext/remote_test.go @@ -8,7 +8,7 @@ import ( "net/url" "testing" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/builder/remotecontext/tarsum_test.go b/daemon/builder/remotecontext/tarsum_test.go similarity index 98% rename from builder/remotecontext/tarsum_test.go rename to daemon/builder/remotecontext/tarsum_test.go index 9604677399..f2ef6110e2 100644 --- a/builder/remotecontext/tarsum_test.go +++ b/daemon/builder/remotecontext/tarsum_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/moby/go-archive" "github.com/moby/sys/reexec" "github.com/pkg/errors" diff --git a/builder/remotecontext/urlutil/urlutil.go b/daemon/builder/remotecontext/urlutil/urlutil.go similarity index 100% rename from builder/remotecontext/urlutil/urlutil.go rename to daemon/builder/remotecontext/urlutil/urlutil.go diff --git a/builder/remotecontext/urlutil/urlutil_test.go b/daemon/builder/remotecontext/urlutil/urlutil_test.go similarity index 100% rename from builder/remotecontext/urlutil/urlutil_test.go rename to daemon/builder/remotecontext/urlutil/urlutil_test.go diff --git a/builder/remotecontext/utils_test.go b/daemon/builder/remotecontext/utils_test.go similarity index 100% rename from builder/remotecontext/utils_test.go rename to daemon/builder/remotecontext/utils_test.go diff --git a/daemon/command/daemon.go b/daemon/command/daemon.go index fa19b43594..d9beb26c87 100644 --- a/daemon/command/daemon.go +++ b/daemon/command/daemon.go @@ -19,9 +19,9 @@ import ( "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/log" "github.com/docker/docker/api" - "github.com/docker/docker/builder/dockerfile" "github.com/docker/docker/daemon" buildbackend "github.com/docker/docker/daemon/build" + "github.com/docker/docker/daemon/builder/dockerfile" "github.com/docker/docker/daemon/cluster" "github.com/docker/docker/daemon/command/debug" "github.com/docker/docker/daemon/command/trap" diff --git a/daemon/commit.go b/daemon/commit.go index 8795071e7f..7303d6464b 100644 --- a/daemon/commit.go +++ b/daemon/commit.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/api/types/backend" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" - "github.com/docker/docker/builder/dockerfile" + "github.com/docker/docker/daemon/builder/dockerfile" "github.com/docker/docker/daemon/internal/metrics" "github.com/docker/docker/errdefs" "github.com/pkg/errors" diff --git a/daemon/containerd/cache.go b/daemon/containerd/cache.go index 7b66071d33..c925a5474e 100644 --- a/daemon/containerd/cache.go +++ b/daemon/containerd/cache.go @@ -11,7 +11,7 @@ import ( "github.com/containerd/log" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/errdefs" "github.com/docker/docker/image" "github.com/docker/docker/image/cache" diff --git a/daemon/containerd/image_builder.go b/daemon/containerd/image_builder.go index 749f221dcb..4834b5ad01 100644 --- a/daemon/containerd/image_builder.go +++ b/daemon/containerd/image_builder.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/registry" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/errdefs" "github.com/docker/docker/image" "github.com/docker/docker/layer" diff --git a/daemon/containerd/image_import.go b/daemon/containerd/image_import.go index 2e59b8508d..bdc017620a 100644 --- a/daemon/containerd/image_import.go +++ b/daemon/containerd/image_import.go @@ -17,7 +17,7 @@ import ( "github.com/distribution/reference" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" - "github.com/docker/docker/builder/dockerfile" + "github.com/docker/docker/daemon/builder/dockerfile" "github.com/docker/docker/errdefs" "github.com/docker/docker/image" "github.com/docker/docker/pkg/pools" diff --git a/daemon/daemon.go b/daemon/daemon.go index 987524e4bc..2c60fbbc18 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -38,7 +38,7 @@ import ( registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/swarm" volumetypes "github.com/docker/docker/api/types/volume" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" executorpkg "github.com/docker/docker/daemon/cluster/executor" "github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/container" diff --git a/daemon/image_service.go b/daemon/image_service.go index d27fa98185..a8fc42ab1c 100644 --- a/daemon/image_service.go +++ b/daemon/image_service.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types/filters" imagetype "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/registry" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/daemon/container" "github.com/docker/docker/daemon/images" "github.com/docker/docker/image" diff --git a/daemon/images/cache.go b/daemon/images/cache.go index e347734d09..61e3f01864 100644 --- a/daemon/images/cache.go +++ b/daemon/images/cache.go @@ -7,7 +7,7 @@ import ( "github.com/containerd/log" "github.com/docker/docker/api/types/backend" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/image" "github.com/docker/docker/image/cache" "github.com/docker/docker/layer" diff --git a/daemon/images/image_builder.go b/daemon/images/image_builder.go index 9467f777d7..3b17df8f7b 100644 --- a/daemon/images/image_builder.go +++ b/daemon/images/image_builder.go @@ -11,7 +11,7 @@ import ( "github.com/distribution/reference" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/registry" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/image" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/progress" diff --git a/daemon/images/image_import.go b/daemon/images/image_import.go index 806820977b..9ee65e249c 100644 --- a/daemon/images/image_import.go +++ b/daemon/images/image_import.go @@ -10,7 +10,7 @@ import ( "github.com/distribution/reference" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" - "github.com/docker/docker/builder/dockerfile" + "github.com/docker/docker/daemon/builder/dockerfile" "github.com/docker/docker/dockerversion" "github.com/docker/docker/errdefs" "github.com/docker/docker/image" diff --git a/daemon/internal/builder-next/builder.go b/daemon/internal/builder-next/builder.go index 7b6284447b..ae711a4535 100644 --- a/daemon/internal/builder-next/builder.go +++ b/daemon/internal/builder-next/builder.go @@ -17,7 +17,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" timetypes "github.com/docker/docker/api/types/time" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/images" "github.com/docker/docker/daemon/internal/builder-next/exporter" diff --git a/daemon/server/router/image/image_routes.go b/daemon/server/router/image/image_routes.go index 7f2846f6fa..d67dd241e7 100644 --- a/daemon/server/router/image/image_routes.go +++ b/daemon/server/router/image/image_routes.go @@ -18,7 +18,7 @@ import ( imagetypes "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/versions" - "github.com/docker/docker/builder/remotecontext" + "github.com/docker/docker/daemon/builder/remotecontext" "github.com/docker/docker/daemon/server/httputils" "github.com/docker/docker/dockerversion" "github.com/docker/docker/errdefs" diff --git a/image/cache/cache.go b/image/cache/cache.go index 86c59d26d6..a99af07479 100644 --- a/image/cache/cache.go +++ b/image/cache/cache.go @@ -8,7 +8,7 @@ import ( "github.com/containerd/log" containertypes "github.com/docker/docker/api/types/container" - "github.com/docker/docker/builder" + "github.com/docker/docker/daemon/builder" "github.com/docker/docker/dockerversion" "github.com/docker/docker/image" "github.com/docker/docker/layer"