Merge pull request moby#50534 from thaJeztah/move_backend

api/types: move backend types to daemon/server

Author: vvoland

daemon/attach.go

@@ -9,9 +9,9 @@ import (
 	"github.com/docker/docker/daemon/container"
 	"github.com/docker/docker/daemon/internal/stream"
 	"github.com/docker/docker/daemon/logger"
+	"github.com/docker/docker/daemon/server/backend"
 	"github.com/docker/docker/errdefs"
 	"github.com/moby/moby/api/stdcopy"
-	"github.com/moby/moby/api/types/backend"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/term"

daemon/builder/backend/backend.go

@@ -11,7 +11,7 @@ import (
 	buildkit "github.com/docker/docker/daemon/internal/builder-next"
 	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/stringid"
-	"github.com/moby/moby/api/types/backend"
+	"github.com/docker/docker/daemon/server/backend"
 	"github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/events"
 	"github.com/pkg/errors"

daemon/builder/builder.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/layer"
-	"github.com/moby/moby/api/types/backend"
+	"github.com/docker/docker/daemon/server/backend"
 	"github.com/moby/moby/api/types/container"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

daemon/builder/dockerfile/builder.go

@@ -13,11 +13,11 @@ import (
 	"github.com/docker/docker/daemon/builder"
 	"github.com/docker/docker/daemon/builder/remotecontext"
 	"github.com/docker/docker/daemon/internal/stringid"
+	"github.com/docker/docker/daemon/server/backend"
 	"github.com/docker/docker/errdefs"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/buildkit/frontend/dockerfile/parser"
 	"github.com/moby/buildkit/frontend/dockerfile/shell"
-	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/sys/user"

daemon/builder/dockerfile/containerbackend.go

@@ -9,7 +9,7 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/builder"
 	"github.com/docker/docker/daemon/internal/stringid"
-	"github.com/moby/moby/api/types/backend"
+	"github.com/docker/docker/daemon/server/backend"
 	"github.com/moby/moby/api/types/container"
 	"github.com/pkg/errors"
 )

daemon/builder/dockerfile/dispatchers_test.go

@@ -11,11 +11,11 @@ import (
 	"github.com/docker/docker/daemon/builder"
 	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/pkg/oci"
+	"github.com/docker/docker/daemon/server/backend"
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/buildkit/frontend/dockerfile/parser"
 	"github.com/moby/buildkit/frontend/dockerfile/shell"
-	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/container"
 	"gotest.tools/v3/assert"

daemon/builder/dockerfile/imagecontext.go

@@ -8,7 +8,7 @@ import (
 	"github.com/containerd/platforms"
 	"github.com/docker/docker/daemon/builder"
 	dockerimage "github.com/docker/docker/daemon/internal/image"
-	"github.com/moby/moby/api/types/backend"
+	"github.com/docker/docker/daemon/server/backend"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 )

daemon/builder/dockerfile/internals.go

@@ -16,10 +16,10 @@ import (
 	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/stringid"
 	networkSettings "github.com/docker/docker/daemon/network"
+	"github.com/docker/docker/daemon/server/backend"
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/go-archive"
 	"github.com/moby/go-archive/chrootarchive"
-	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/network"

daemon/builder/dockerfile/internals_test.go

@@ -11,9 +11,9 @@ import (
 	"github.com/docker/docker/daemon/builder/remotecontext"
 	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/layer"
+	"github.com/docker/docker/daemon/server/backend"
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/go-archive"
-	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/container"
 	"github.com/opencontainers/go-digest"

daemon/builder/dockerfile/mockbackend_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/docker/docker/daemon/builder"
 	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/layer"
-	"github.com/moby/moby/api/types/backend"
+	"github.com/docker/docker/daemon/server/backend"
 	"github.com/moby/moby/api/types/container"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"