diff --git a/api/server/backend/build/backend.go b/daemon/build/backend.go similarity index 100% rename from api/server/backend/build/backend.go rename to daemon/build/backend.go diff --git a/api/server/backend/build/tag.go b/daemon/build/tag.go similarity index 100% rename from api/server/backend/build/tag.go rename to daemon/build/tag.go diff --git a/daemon/cluster/executor/container/validate_windows_test.go b/daemon/cluster/executor/container/validate_windows_test.go index e934374031..d9fc564ba7 100644 --- a/daemon/cluster/executor/container/validate_windows_test.go +++ b/daemon/cluster/executor/container/validate_windows_test.go @@ -1,6 +1,7 @@ //go:build windows package container + import ( "strings" "testing" diff --git a/daemon/command/daemon.go b/daemon/command/daemon.go index 0224bc11c4..6d6f45d630 100644 --- a/daemon/command/daemon.go +++ b/daemon/command/daemon.go @@ -19,32 +19,32 @@ import ( "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/log" "github.com/docker/docker/api" - apiserver "github.com/docker/docker/api/server" - buildbackend "github.com/docker/docker/api/server/backend/build" - "github.com/docker/docker/api/server/middleware" - "github.com/docker/docker/api/server/router" - "github.com/docker/docker/api/server/router/build" - checkpointrouter "github.com/docker/docker/api/server/router/checkpoint" - "github.com/docker/docker/api/server/router/container" - debugrouter "github.com/docker/docker/api/server/router/debug" - distributionrouter "github.com/docker/docker/api/server/router/distribution" - grpcrouter "github.com/docker/docker/api/server/router/grpc" - "github.com/docker/docker/api/server/router/image" - "github.com/docker/docker/api/server/router/network" - pluginrouter "github.com/docker/docker/api/server/router/plugin" - sessionrouter "github.com/docker/docker/api/server/router/session" - swarmrouter "github.com/docker/docker/api/server/router/swarm" - systemrouter "github.com/docker/docker/api/server/router/system" - "github.com/docker/docker/api/server/router/volume" 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" "github.com/docker/docker/daemon/cluster" "github.com/docker/docker/daemon/command/debug" "github.com/docker/docker/daemon/command/trap" "github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/listeners" + apiserver "github.com/docker/docker/daemon/server" + "github.com/docker/docker/daemon/server/middleware" + "github.com/docker/docker/daemon/server/router" + "github.com/docker/docker/daemon/server/router/build" + checkpointrouter "github.com/docker/docker/daemon/server/router/checkpoint" + "github.com/docker/docker/daemon/server/router/container" + debugrouter "github.com/docker/docker/daemon/server/router/debug" + distributionrouter "github.com/docker/docker/daemon/server/router/distribution" + grpcrouter "github.com/docker/docker/daemon/server/router/grpc" + "github.com/docker/docker/daemon/server/router/image" + "github.com/docker/docker/daemon/server/router/network" + pluginrouter "github.com/docker/docker/daemon/server/router/plugin" + sessionrouter "github.com/docker/docker/daemon/server/router/session" + swarmrouter "github.com/docker/docker/daemon/server/router/swarm" + systemrouter "github.com/docker/docker/daemon/server/router/system" + "github.com/docker/docker/daemon/server/router/volume" "github.com/docker/docker/dockerversion" "github.com/docker/docker/internal/otelutil" "github.com/docker/docker/libcontainerd/supervisor" diff --git a/daemon/disk_usage.go b/daemon/disk_usage.go index 9f6d3ad376..59ef0896d2 100644 --- a/daemon/disk_usage.go +++ b/daemon/disk_usage.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/docker/docker/api/server/router/system" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/image" systemtypes "github.com/docker/docker/api/types/system" "github.com/docker/docker/api/types/volume" + "github.com/docker/docker/daemon/server/router/system" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/api/server/httpstatus/status.go b/daemon/server/httpstatus/status.go similarity index 100% rename from api/server/httpstatus/status.go rename to daemon/server/httpstatus/status.go diff --git a/api/server/httputils/decoder.go b/daemon/server/httputils/decoder.go similarity index 100% rename from api/server/httputils/decoder.go rename to daemon/server/httputils/decoder.go diff --git a/api/server/httputils/form.go b/daemon/server/httputils/form.go similarity index 100% rename from api/server/httputils/form.go rename to daemon/server/httputils/form.go diff --git a/api/server/httputils/form_test.go b/daemon/server/httputils/form_test.go similarity index 100% rename from api/server/httputils/form_test.go rename to daemon/server/httputils/form_test.go diff --git a/api/server/httputils/httputils.go b/daemon/server/httputils/httputils.go similarity index 100% rename from api/server/httputils/httputils.go rename to daemon/server/httputils/httputils.go diff --git a/api/server/httputils/httputils_test.go b/daemon/server/httputils/httputils_test.go similarity index 100% rename from api/server/httputils/httputils_test.go rename to daemon/server/httputils/httputils_test.go diff --git a/api/server/httputils/write_log_stream.go b/daemon/server/httputils/write_log_stream.go similarity index 100% rename from api/server/httputils/write_log_stream.go rename to daemon/server/httputils/write_log_stream.go diff --git a/api/server/middleware.go b/daemon/server/middleware.go similarity index 84% rename from api/server/middleware.go rename to daemon/server/middleware.go index c849c9fe16..8278f255c2 100644 --- a/api/server/middleware.go +++ b/daemon/server/middleware.go @@ -2,8 +2,8 @@ package server import ( "github.com/containerd/log" - "github.com/docker/docker/api/server/httputils" - "github.com/docker/docker/api/server/middleware" + "github.com/docker/docker/daemon/server/httputils" + "github.com/docker/docker/daemon/server/middleware" ) // handlerWithGlobalMiddlewares wraps the handler function for a request with diff --git a/api/server/middleware/debug.go b/daemon/server/middleware/debug.go similarity index 97% rename from api/server/middleware/debug.go rename to daemon/server/middleware/debug.go index bc4f3fa6d7..376b55fc6f 100644 --- a/api/server/middleware/debug.go +++ b/daemon/server/middleware/debug.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/containerd/log" - "github.com/docker/docker/api/server/httpstatus" - "github.com/docker/docker/api/server/httputils" + "github.com/docker/docker/daemon/server/httpstatus" + "github.com/docker/docker/daemon/server/httputils" "github.com/docker/docker/pkg/ioutils" "github.com/sirupsen/logrus" ) diff --git a/api/server/middleware/debug_test.go b/daemon/server/middleware/debug_test.go similarity index 100% rename from api/server/middleware/debug_test.go rename to daemon/server/middleware/debug_test.go diff --git a/api/server/middleware/experimental.go b/daemon/server/middleware/experimental.go similarity index 100% rename from api/server/middleware/experimental.go rename to daemon/server/middleware/experimental.go diff --git a/api/server/middleware/middleware.go b/daemon/server/middleware/middleware.go similarity index 100% rename from api/server/middleware/middleware.go rename to daemon/server/middleware/middleware.go diff --git a/api/server/middleware/version.go b/daemon/server/middleware/version.go similarity index 98% rename from api/server/middleware/version.go rename to daemon/server/middleware/version.go index bb1d86d741..a73975c4ec 100644 --- a/api/server/middleware/version.go +++ b/daemon/server/middleware/version.go @@ -7,8 +7,8 @@ import ( "runtime" "github.com/docker/docker/api" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/daemon/server/httputils" ) // VersionMiddleware is a middleware that diff --git a/api/server/middleware/version_test.go b/daemon/server/middleware/version_test.go similarity index 98% rename from api/server/middleware/version_test.go rename to daemon/server/middleware/version_test.go index 0df55ea349..a03a462d1b 100644 --- a/api/server/middleware/version_test.go +++ b/daemon/server/middleware/version_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/docker/docker/api" - "github.com/docker/docker/api/server/httputils" + "github.com/docker/docker/daemon/server/httputils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/api/server/router/build/backend.go b/daemon/server/router/build/backend.go similarity index 100% rename from api/server/router/build/backend.go rename to daemon/server/router/build/backend.go diff --git a/api/server/router/build/build.go b/daemon/server/router/build/build.go similarity index 97% rename from api/server/router/build/build.go rename to daemon/server/router/build/build.go index 78e480e1ec..dee9f6dadd 100644 --- a/api/server/router/build/build.go +++ b/daemon/server/router/build/build.go @@ -3,8 +3,8 @@ package build import ( "runtime" - "github.com/docker/docker/api/server/router" "github.com/docker/docker/api/types/build" + "github.com/docker/docker/daemon/server/router" ) // buildRouter is a router to talk with the build controller diff --git a/api/server/router/build/build_routes.go b/daemon/server/router/build/build_routes.go similarity index 99% rename from api/server/router/build/build_routes.go rename to daemon/server/router/build/build_routes.go index 502bd12170..57e05572cd 100644 --- a/api/server/router/build/build_routes.go +++ b/daemon/server/router/build/build_routes.go @@ -16,13 +16,13 @@ import ( "syscall" "github.com/containerd/log" - "github.com/docker/docker/api/server/httputils" "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/api/types/filters" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/daemon/server/httputils" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/streamformatter" diff --git a/api/server/router/checkpoint/backend.go b/daemon/server/router/checkpoint/backend.go similarity index 100% rename from api/server/router/checkpoint/backend.go rename to daemon/server/router/checkpoint/backend.go diff --git a/api/server/router/checkpoint/checkpoint.go b/daemon/server/router/checkpoint/checkpoint.go similarity index 90% rename from api/server/router/checkpoint/checkpoint.go rename to daemon/server/router/checkpoint/checkpoint.go index d620cebaeb..fa66fd21ac 100644 --- a/api/server/router/checkpoint/checkpoint.go +++ b/daemon/server/router/checkpoint/checkpoint.go @@ -1,8 +1,8 @@ package checkpoint import ( - "github.com/docker/docker/api/server/httputils" - "github.com/docker/docker/api/server/router" + "github.com/docker/docker/daemon/server/httputils" + "github.com/docker/docker/daemon/server/router" ) // checkpointRouter is a router to talk with the checkpoint controller diff --git a/api/server/router/checkpoint/checkpoint_routes.go b/daemon/server/router/checkpoint/checkpoint_routes.go similarity index 96% rename from api/server/router/checkpoint/checkpoint_routes.go rename to daemon/server/router/checkpoint/checkpoint_routes.go index 340fab91a4..5c28442e65 100644 --- a/api/server/router/checkpoint/checkpoint_routes.go +++ b/daemon/server/router/checkpoint/checkpoint_routes.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/checkpoint" + "github.com/docker/docker/daemon/server/httputils" ) func (cr *checkpointRouter) postContainerCheckpoint(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { diff --git a/api/server/router/container/backend.go b/daemon/server/router/container/backend.go similarity index 100% rename from api/server/router/container/backend.go rename to daemon/server/router/container/backend.go diff --git a/api/server/router/container/container.go b/daemon/server/router/container/container.go similarity index 96% rename from api/server/router/container/container.go rename to daemon/server/router/container/container.go index 6e3d0b08eb..4f876cbf82 100644 --- a/api/server/router/container/container.go +++ b/daemon/server/router/container/container.go @@ -1,8 +1,8 @@ package container import ( - "github.com/docker/docker/api/server/httputils" - "github.com/docker/docker/api/server/router" + "github.com/docker/docker/daemon/server/httputils" + "github.com/docker/docker/daemon/server/router" ) // containerRouter is a router to talk with the container controller diff --git a/api/server/router/container/container_routes.go b/daemon/server/router/container/container_routes.go similarity index 99% rename from api/server/router/container/container_routes.go rename to daemon/server/router/container/container_routes.go index 2855322667..f21d70415e 100644 --- a/api/server/router/container/container_routes.go +++ b/daemon/server/router/container/container_routes.go @@ -12,8 +12,6 @@ import ( "github.com/containerd/log" "github.com/containerd/platforms" - "github.com/docker/docker/api/server/httpstatus" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" @@ -22,6 +20,8 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/versions" networkSettings "github.com/docker/docker/daemon/network" + "github.com/docker/docker/daemon/server/httpstatus" + "github.com/docker/docker/daemon/server/httputils" "github.com/docker/docker/errdefs" "github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/pkg/ioutils" diff --git a/api/server/router/container/container_routes_test.go b/daemon/server/router/container/container_routes_test.go similarity index 100% rename from api/server/router/container/container_routes_test.go rename to daemon/server/router/container/container_routes_test.go diff --git a/api/server/router/container/copy.go b/daemon/server/router/container/copy.go similarity index 97% rename from api/server/router/container/copy.go rename to daemon/server/router/container/copy.go index 84da3a07b1..bde6786b40 100644 --- a/api/server/router/container/copy.go +++ b/daemon/server/router/container/copy.go @@ -9,8 +9,8 @@ import ( "io" "net/http" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/container" + "github.com/docker/docker/daemon/server/httputils" gddohttputil "github.com/golang/gddo/httputil" ) diff --git a/api/server/router/container/exec.go b/daemon/server/router/container/exec.go similarity index 98% rename from api/server/router/container/exec.go rename to daemon/server/router/container/exec.go index c9f0213496..7e4582a347 100644 --- a/api/server/router/container/exec.go +++ b/daemon/server/router/container/exec.go @@ -7,11 +7,11 @@ import ( "net/http" "github.com/containerd/log" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/daemon/server/httputils" "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/stdcopy" "github.com/pkg/errors" diff --git a/api/server/router/container/inspect.go b/daemon/server/router/container/inspect.go similarity index 96% rename from api/server/router/container/inspect.go rename to daemon/server/router/container/inspect.go index 4dcea1b0d8..f33465c22e 100644 --- a/api/server/router/container/inspect.go +++ b/daemon/server/router/container/inspect.go @@ -7,10 +7,10 @@ import ( "context" "net/http" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/daemon/server/httputils" "github.com/docker/docker/internal/sliceutil" "github.com/docker/docker/pkg/stringid" ) diff --git a/api/server/router/container/notify_linux.go b/daemon/server/router/container/notify_linux.go similarity index 100% rename from api/server/router/container/notify_linux.go rename to daemon/server/router/container/notify_linux.go diff --git a/api/server/router/container/notify_unsupported.go b/daemon/server/router/container/notify_unsupported.go similarity index 100% rename from api/server/router/container/notify_unsupported.go rename to daemon/server/router/container/notify_unsupported.go diff --git a/api/server/router/debug/debug.go b/daemon/server/router/debug/debug.go similarity index 93% rename from api/server/router/debug/debug.go rename to daemon/server/router/debug/debug.go index 652679db78..61ffba6919 100644 --- a/api/server/router/debug/debug.go +++ b/daemon/server/router/debug/debug.go @@ -6,8 +6,8 @@ import ( "net/http" "net/http/pprof" - "github.com/docker/docker/api/server/httputils" - "github.com/docker/docker/api/server/router" + "github.com/docker/docker/daemon/server/httputils" + "github.com/docker/docker/daemon/server/router" ) // NewRouter creates a new debug router diff --git a/api/server/router/debug/debug_routes.go b/daemon/server/router/debug/debug_routes.go similarity index 100% rename from api/server/router/debug/debug_routes.go rename to daemon/server/router/debug/debug_routes.go diff --git a/api/server/router/distribution/backend.go b/daemon/server/router/distribution/backend.go similarity index 100% rename from api/server/router/distribution/backend.go rename to daemon/server/router/distribution/backend.go diff --git a/api/server/router/distribution/distribution.go b/daemon/server/router/distribution/distribution.go similarity index 92% rename from api/server/router/distribution/distribution.go rename to daemon/server/router/distribution/distribution.go index 81a6339131..c4fcae3701 100644 --- a/api/server/router/distribution/distribution.go +++ b/daemon/server/router/distribution/distribution.go @@ -1,6 +1,6 @@ package distribution -import "github.com/docker/docker/api/server/router" +import "github.com/docker/docker/daemon/server/router" // distributionRouter is a router to talk with the registry type distributionRouter struct { diff --git a/api/server/router/distribution/distribution_routes.go b/daemon/server/router/distribution/distribution_routes.go similarity index 99% rename from api/server/router/distribution/distribution_routes.go rename to daemon/server/router/distribution/distribution_routes.go index 03e69238fb..75bc183de7 100644 --- a/api/server/router/distribution/distribution_routes.go +++ b/daemon/server/router/distribution/distribution_routes.go @@ -10,8 +10,8 @@ import ( "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema2" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/registry" + "github.com/docker/docker/daemon/server/httputils" distributionpkg "github.com/docker/docker/distribution" "github.com/docker/docker/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/api/server/router/experimental.go b/daemon/server/router/experimental.go similarity index 96% rename from api/server/router/experimental.go rename to daemon/server/router/experimental.go index d0a21e50b2..9e92a1d42b 100644 --- a/api/server/router/experimental.go +++ b/daemon/server/router/experimental.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/docker/docker/api/server/httputils" + "github.com/docker/docker/daemon/server/httputils" ) // ExperimentalRoute defines an experimental API route that can be enabled or disabled. diff --git a/api/server/router/grpc/backend.go b/daemon/server/router/grpc/backend.go similarity index 100% rename from api/server/router/grpc/backend.go rename to daemon/server/router/grpc/backend.go diff --git a/api/server/router/grpc/grpc.go b/daemon/server/router/grpc/grpc.go similarity index 98% rename from api/server/router/grpc/grpc.go rename to daemon/server/router/grpc/grpc.go index da0209a231..bacd776dca 100644 --- a/api/server/router/grpc/grpc.go +++ b/daemon/server/router/grpc/grpc.go @@ -11,7 +11,7 @@ import ( "github.com/containerd/containerd/v2/defaults" "github.com/containerd/log" - "github.com/docker/docker/api/server/router" + "github.com/docker/docker/daemon/server/router" "github.com/docker/docker/internal/otelutil" "github.com/moby/buildkit/util/grpcerrors" "github.com/moby/buildkit/util/stack" diff --git a/api/server/router/grpc/grpc_routes.go b/daemon/server/router/grpc/grpc_routes.go similarity index 100% rename from api/server/router/grpc/grpc_routes.go rename to daemon/server/router/grpc/grpc_routes.go diff --git a/api/server/router/image/backend.go b/daemon/server/router/image/backend.go similarity index 100% rename from api/server/router/image/backend.go rename to daemon/server/router/image/backend.go diff --git a/api/server/router/image/image.go b/daemon/server/router/image/image.go similarity index 96% rename from api/server/router/image/image.go rename to daemon/server/router/image/image.go index f0401d756c..092831b3b1 100644 --- a/api/server/router/image/image.go +++ b/daemon/server/router/image/image.go @@ -1,7 +1,7 @@ package image import ( - "github.com/docker/docker/api/server/router" + "github.com/docker/docker/daemon/server/router" ) // imageRouter is a router to talk with the image controller diff --git a/api/server/router/image/image_routes.go b/daemon/server/router/image/image_routes.go similarity index 99% rename from api/server/router/image/image_routes.go rename to daemon/server/router/image/image_routes.go index 23096e5418..3810ba6724 100644 --- a/api/server/router/image/image_routes.go +++ b/daemon/server/router/image/image_routes.go @@ -13,13 +13,13 @@ import ( "github.com/containerd/platforms" "github.com/distribution/reference" "github.com/docker/docker/api" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/filters" 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/server/httputils" "github.com/docker/docker/dockerversion" "github.com/docker/docker/errdefs" "github.com/docker/docker/image" diff --git a/api/server/router/image/inspect_response.go b/daemon/server/router/image/inspect_response.go similarity index 100% rename from api/server/router/image/inspect_response.go rename to daemon/server/router/image/inspect_response.go diff --git a/api/server/router/image/inspect_response_test.go b/daemon/server/router/image/inspect_response_test.go similarity index 100% rename from api/server/router/image/inspect_response_test.go rename to daemon/server/router/image/inspect_response_test.go diff --git a/api/server/router/local.go b/daemon/server/router/local.go similarity index 97% rename from api/server/router/local.go rename to daemon/server/router/local.go index 8a27e2f913..b32abea663 100644 --- a/api/server/router/local.go +++ b/daemon/server/router/local.go @@ -3,7 +3,7 @@ package router import ( "net/http" - "github.com/docker/docker/api/server/httputils" + "github.com/docker/docker/daemon/server/httputils" ) // RouteWrapper wraps a route with extra functionality. diff --git a/api/server/router/network/backend.go b/daemon/server/router/network/backend.go similarity index 100% rename from api/server/router/network/backend.go rename to daemon/server/router/network/backend.go diff --git a/api/server/router/network/network.go b/daemon/server/router/network/network.go similarity index 95% rename from api/server/router/network/network.go rename to daemon/server/router/network/network.go index f8b2513f07..c24f25757d 100644 --- a/api/server/router/network/network.go +++ b/daemon/server/router/network/network.go @@ -1,7 +1,7 @@ package network import ( - "github.com/docker/docker/api/server/router" + "github.com/docker/docker/daemon/server/router" ) // networkRouter is a router to talk with the network controller diff --git a/api/server/router/network/network_routes.go b/daemon/server/router/network/network_routes.go similarity index 99% rename from api/server/router/network/network_routes.go rename to daemon/server/router/network/network_routes.go index b888d841bc..f15c469a5e 100644 --- a/api/server/router/network/network_routes.go +++ b/daemon/server/router/network/network_routes.go @@ -6,11 +6,11 @@ import ( "strconv" "strings" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/daemon/server/httputils" "github.com/docker/docker/errdefs" "github.com/docker/docker/libnetwork" "github.com/docker/docker/libnetwork/scope" diff --git a/api/server/router/plugin/backend.go b/daemon/server/router/plugin/backend.go similarity index 100% rename from api/server/router/plugin/backend.go rename to daemon/server/router/plugin/backend.go diff --git a/api/server/router/plugin/plugin.go b/daemon/server/router/plugin/plugin.go similarity index 95% rename from api/server/router/plugin/plugin.go rename to daemon/server/router/plugin/plugin.go index 6ff38d3468..1a4974bf68 100644 --- a/api/server/router/plugin/plugin.go +++ b/daemon/server/router/plugin/plugin.go @@ -1,6 +1,6 @@ package plugin -import "github.com/docker/docker/api/server/router" +import "github.com/docker/docker/daemon/server/router" // pluginRouter is a router to talk with the plugin controller type pluginRouter struct { diff --git a/api/server/router/plugin/plugin_routes.go b/daemon/server/router/plugin/plugin_routes.go similarity index 99% rename from api/server/router/plugin/plugin_routes.go rename to daemon/server/router/plugin/plugin_routes.go index 07b95cceb4..473035a223 100644 --- a/api/server/router/plugin/plugin_routes.go +++ b/daemon/server/router/plugin/plugin_routes.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/distribution/reference" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/registry" + "github.com/docker/docker/daemon/server/httputils" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/streamformatter" "github.com/pkg/errors" diff --git a/api/server/router/router.go b/daemon/server/router/router.go similarity index 90% rename from api/server/router/router.go rename to daemon/server/router/router.go index 2de25c27ff..39727c9c7d 100644 --- a/api/server/router/router.go +++ b/daemon/server/router/router.go @@ -1,6 +1,6 @@ package router -import "github.com/docker/docker/api/server/httputils" +import "github.com/docker/docker/daemon/server/httputils" // Router defines an interface to specify a group of routes to add to the docker server. type Router interface { diff --git a/api/server/router/session/backend.go b/daemon/server/router/session/backend.go similarity index 100% rename from api/server/router/session/backend.go rename to daemon/server/router/session/backend.go diff --git a/api/server/router/session/session.go b/daemon/server/router/session/session.go similarity index 91% rename from api/server/router/session/session.go rename to daemon/server/router/session/session.go index 145a6b46aa..c59777a5cf 100644 --- a/api/server/router/session/session.go +++ b/daemon/server/router/session/session.go @@ -1,6 +1,6 @@ package session -import "github.com/docker/docker/api/server/router" +import "github.com/docker/docker/daemon/server/router" // sessionRouter is a router to talk with the session controller type sessionRouter struct { diff --git a/api/server/router/session/session_routes.go b/daemon/server/router/session/session_routes.go similarity index 100% rename from api/server/router/session/session_routes.go rename to daemon/server/router/session/session_routes.go diff --git a/api/server/router/swarm/backend.go b/daemon/server/router/swarm/backend.go similarity index 100% rename from api/server/router/swarm/backend.go rename to daemon/server/router/swarm/backend.go diff --git a/api/server/router/swarm/cluster.go b/daemon/server/router/swarm/cluster.go similarity index 97% rename from api/server/router/swarm/cluster.go rename to daemon/server/router/swarm/cluster.go index a2636a2b00..fb14716776 100644 --- a/api/server/router/swarm/cluster.go +++ b/daemon/server/router/swarm/cluster.go @@ -1,6 +1,6 @@ package swarm -import "github.com/docker/docker/api/server/router" +import "github.com/docker/docker/daemon/server/router" // swarmRouter is a router to talk with the build controller type swarmRouter struct { diff --git a/api/server/router/swarm/cluster_routes.go b/daemon/server/router/swarm/cluster_routes.go similarity index 99% rename from api/server/router/swarm/cluster_routes.go rename to daemon/server/router/swarm/cluster_routes.go index 9a96ed85b4..2e092ee664 100644 --- a/api/server/router/swarm/cluster_routes.go +++ b/daemon/server/router/swarm/cluster_routes.go @@ -7,12 +7,12 @@ import ( "strconv" "github.com/containerd/log" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/registry" types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/daemon/server/httputils" "github.com/docker/docker/errdefs" "github.com/pkg/errors" ) diff --git a/api/server/router/swarm/helpers.go b/daemon/server/router/swarm/helpers.go similarity index 99% rename from api/server/router/swarm/helpers.go rename to daemon/server/router/swarm/helpers.go index 31526c9227..4fc46aa0e4 100644 --- a/api/server/router/swarm/helpers.go +++ b/daemon/server/router/swarm/helpers.go @@ -5,12 +5,12 @@ import ( "errors" "net/http" - "github.com/docker/docker/api/server/httputils" basictypes "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/daemon/server/httputils" ) // swarmLogs takes an http response, request, and selector, and writes the logs diff --git a/api/server/router/swarm/helpers_test.go b/daemon/server/router/swarm/helpers_test.go similarity index 100% rename from api/server/router/swarm/helpers_test.go rename to daemon/server/router/swarm/helpers_test.go diff --git a/api/server/router/system/backend.go b/daemon/server/router/system/backend.go similarity index 100% rename from api/server/router/system/backend.go rename to daemon/server/router/system/backend.go diff --git a/api/server/router/system/info_response.go b/daemon/server/router/system/info_response.go similarity index 100% rename from api/server/router/system/info_response.go rename to daemon/server/router/system/info_response.go diff --git a/api/server/router/system/info_response_test.go b/daemon/server/router/system/info_response_test.go similarity index 100% rename from api/server/router/system/info_response_test.go rename to daemon/server/router/system/info_response_test.go diff --git a/api/server/router/system/system.go b/daemon/server/router/system/system.go similarity index 96% rename from api/server/router/system/system.go rename to daemon/server/router/system/system.go index d61c0c32b3..aeb0893f46 100644 --- a/api/server/router/system/system.go +++ b/daemon/server/router/system/system.go @@ -4,7 +4,7 @@ package system import ( - "github.com/docker/docker/api/server/router" + "github.com/docker/docker/daemon/server/router" "resenje.org/singleflight" ) diff --git a/api/server/router/system/system_routes.go b/daemon/server/router/system/system_routes.go similarity index 99% rename from api/server/router/system/system_routes.go rename to daemon/server/router/system/system_routes.go index a5376ebaec..59c3b9567e 100644 --- a/api/server/router/system/system_routes.go +++ b/daemon/server/router/system/system_routes.go @@ -11,8 +11,6 @@ import ( "time" "github.com/containerd/log" - "github.com/docker/docker/api/server/httputils" - "github.com/docker/docker/api/server/router/build" "github.com/docker/docker/api/types" buildtypes "github.com/docker/docker/api/types/build" "github.com/docker/docker/api/types/events" @@ -22,6 +20,8 @@ import ( "github.com/docker/docker/api/types/system" timetypes "github.com/docker/docker/api/types/time" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/daemon/server/httputils" + "github.com/docker/docker/daemon/server/router/build" "github.com/docker/docker/pkg/ioutils" "github.com/pkg/errors" "golang.org/x/sync/errgroup" diff --git a/api/server/router/volume/backend.go b/daemon/server/router/volume/backend.go similarity index 100% rename from api/server/router/volume/backend.go rename to daemon/server/router/volume/backend.go diff --git a/api/server/router/volume/volume.go b/daemon/server/router/volume/volume.go similarity index 94% rename from api/server/router/volume/volume.go rename to daemon/server/router/volume/volume.go index e49f9553a0..108f17da64 100644 --- a/api/server/router/volume/volume.go +++ b/daemon/server/router/volume/volume.go @@ -1,6 +1,6 @@ package volume -import "github.com/docker/docker/api/server/router" +import "github.com/docker/docker/daemon/server/router" // volumeRouter is a router to talk with the volumes controller type volumeRouter struct { diff --git a/api/server/router/volume/volume_routes.go b/daemon/server/router/volume/volume_routes.go similarity index 99% rename from api/server/router/volume/volume_routes.go rename to daemon/server/router/volume/volume_routes.go index a266763a92..a8ba8129f6 100644 --- a/api/server/router/volume/volume_routes.go +++ b/daemon/server/router/volume/volume_routes.go @@ -8,10 +8,10 @@ import ( cerrdefs "github.com/containerd/errdefs" "github.com/containerd/log" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/api/types/volume" + "github.com/docker/docker/daemon/server/httputils" "github.com/docker/docker/errdefs" "github.com/docker/docker/volume/service/opts" "github.com/pkg/errors" diff --git a/api/server/router/volume/volume_routes_test.go b/daemon/server/router/volume/volume_routes_test.go similarity index 99% rename from api/server/router/volume/volume_routes_test.go rename to daemon/server/router/volume/volume_routes_test.go index 2812cd137f..bebf7f240c 100644 --- a/api/server/router/volume/volume_routes_test.go +++ b/daemon/server/router/volume/volume_routes_test.go @@ -13,9 +13,9 @@ import ( "gotest.tools/v3/assert" cerrdefs "github.com/containerd/errdefs" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/volume" + "github.com/docker/docker/daemon/server/httputils" "github.com/docker/docker/errdefs" "github.com/docker/docker/volume/service/opts" ) diff --git a/api/server/server.go b/daemon/server/server.go similarity index 94% rename from api/server/server.go rename to daemon/server/server.go index 20d9064a04..bb2dc296fb 100644 --- a/api/server/server.go +++ b/daemon/server/server.go @@ -5,12 +5,12 @@ import ( "net/http" "github.com/containerd/log" - "github.com/docker/docker/api/server/httpstatus" - "github.com/docker/docker/api/server/httputils" - "github.com/docker/docker/api/server/middleware" - "github.com/docker/docker/api/server/router" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/daemon/server/httpstatus" + "github.com/docker/docker/daemon/server/httputils" + "github.com/docker/docker/daemon/server/middleware" + "github.com/docker/docker/daemon/server/router" "github.com/docker/docker/dockerversion" "github.com/docker/docker/internal/otelutil" "github.com/gorilla/mux" diff --git a/api/server/server_test.go b/daemon/server/server_test.go similarity index 90% rename from api/server/server_test.go rename to daemon/server/server_test.go index 860e11c5f6..dc93559ab3 100644 --- a/api/server/server_test.go +++ b/daemon/server/server_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/docker/docker/api" - "github.com/docker/docker/api/server/httputils" - "github.com/docker/docker/api/server/middleware" + "github.com/docker/docker/daemon/server/httputils" + "github.com/docker/docker/daemon/server/middleware" ) func TestMiddlewares(t *testing.T) {