Merge pull request #50512 from dmcgowan/make-moby-v2-module

Make `github.com/moby/moby/v2` module

.github/workflows/.windows.yml

@@ -439,7 +439,6 @@ jobs:
           .\hack\make.ps1 -TestIntegration
         env:
           DOCKER_HOST: npipe:////./pipe/docker_engine
-          GO111MODULE: "off"
           TEST_CLIENT_BINARY: ${{ env.BIN_OUT }}\docker
       -
         name: Test integration-cli
@@ -448,7 +447,6 @@ jobs:
           .\hack\make.ps1 -TestIntegrationCli
         env:
           DOCKER_HOST: npipe:////./pipe/docker_engine
-          GO111MODULE: "off"
           TEST_CLIENT_BINARY: ${{ env.BIN_OUT }}\docker
           INTEGRATION_TESTRUN: ${{ matrix.test }}
       -

.github/workflows/codeql.yml

@@ -46,15 +46,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 2
-      # CodeQL 2.16.4's auto-build added support for multi-module repositories,
-      # and is trying to be smart by searching for modules in every directory,
-      # including vendor directories. If no module is found, it's creating one
-      # which is ... not what we want, so let's give it a "go.mod".
-      # see: https://github.com/docker/cli/pull/4944#issuecomment-2002034698
-      - name: Create go.mod
-        run: |
-          ln -s vendor.mod go.mod
-          ln -s vendor.sum go.sum
       - name: Update Go
         uses: actions/setup-go@v5
         with:

Dockerfile

@@ -64,7 +64,6 @@ COPY --from=xx / /
 RUN go telemetry off && [ "$(go telemetry)" = "off" ] || { echo "Failed to disable Go telemetry"; exit 1; }
 RUN echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 RUN apt-get update && apt-get install --no-install-recommends -y file
-ENV GO111MODULE=off
 ENV GOTOOLCHAIN=local
 
 FROM base AS criu
@@ -95,6 +94,7 @@ RUN git fetch -q --depth 1 origin "${GO_SWAGGER_COMMIT}" && git checkout -q FETC
 FROM base AS swagger
 WORKDIR /go/src/github.com/go-swagger/go-swagger
 ARG TARGETPLATFORM
+ENV GO111MODULE=off
 RUN --mount=from=swagger-src,src=/usr/src/swagger,rw \
     --mount=type=cache,target=/root/.cache/go-build,id=swagger-build-$TARGETPLATFORM \
     --mount=type=cache,target=/go/pkg/mod \
@@ -145,7 +145,7 @@ RUN --mount=from=delve-src,src=/usr/src/delve,rw \
     --mount=type=cache,target=/root/.cache/go-build,id=delve-build-$TARGETPLATFORM \
     --mount=type=cache,target=/go/pkg/mod <<EOT
   set -e
-  GO111MODULE=on xx-go build -o /build/dlv ./cmd/dlv
+  xx-go build -o /build/dlv ./cmd/dlv
   xx-verify /build/dlv
 EOT
 
@@ -157,7 +157,7 @@ FROM base AS gowinres
 ARG GOWINRES_VERSION=v0.3.1
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-        GOBIN=/build/ GO111MODULE=on go install "github.com/tc-hib/go-winres@${GOWINRES_VERSION}" \
+        GOBIN=/build/ go install "github.com/tc-hib/go-winres@${GOWINRES_VERSION}" \
      && /build/go-winres --help
 
 # containerd
@@ -205,7 +205,7 @@ FROM base AS golangci_lint
 ARG GOLANGCI_LINT_VERSION=v2.1.5
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-        GOBIN=/build/ GO111MODULE=on go install "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}" \
+        GOBIN=/build/ go install "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}" \
      && /build/golangci-lint --version
 
 FROM base AS gotestsum
@@ -213,20 +213,20 @@ FROM base AS gotestsum
 ARG GOTESTSUM_VERSION=v1.12.3
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-        GOBIN=/build/ GO111MODULE=on go install "gotest.tools/gotestsum@${GOTESTSUM_VERSION}" \
+        GOBIN=/build/ go install "gotest.tools/gotestsum@${GOTESTSUM_VERSION}" \
      && /build/gotestsum --version
 
 FROM base AS shfmt
 ARG SHFMT_VERSION=v3.8.0
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-        GOBIN=/build/ GO111MODULE=on go install "mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}" \
+        GOBIN=/build/ go install "mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}" \
      && /build/shfmt --version
 
 FROM base AS gopls
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-        GOBIN=/build/ GO111MODULE=on go install "golang.org/x/tools/gopls@latest" \
+        GOBIN=/build/ go install "golang.org/x/tools/gopls@latest" \
      && /build/gopls version
 
 FROM base AS dockercli
@@ -342,7 +342,6 @@ RUN --mount=type=cache,sharing=locked,id=moby-rootlesskit-aptlib,target=/var/lib
             gcc \
             libc6-dev \
             pkg-config
-ENV GO111MODULE=on
 ARG DOCKER_STATIC
 RUN --mount=from=rootlesskit-src,src=/usr/src/rootlesskit,rw \
     --mount=type=cache,target=/go/pkg/mod \
@@ -543,7 +542,6 @@ COPY --link --from=dockercli-integration /build/ /usr/local/cli-integration
 FROM base AS build
 COPY --from=gowinres /build/ /usr/local/bin/
 WORKDIR /go/src/github.com/docker/docker
-ENV GO111MODULE=off
 ENV CGO_ENABLED=1
 RUN --mount=type=cache,sharing=locked,id=moby-build-aptlib,target=/var/lib/apt \
     --mount=type=cache,sharing=locked,id=moby-build-aptcache,target=/var/cache/apt \

Dockerfile.simple

@@ -11,7 +11,6 @@ ARG BASE_DEBIAN_DISTRO="bookworm"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
 
 FROM ${GOLANG_IMAGE}
-ENV GO111MODULE=off
 ENV GOTOOLCHAIN=local
 
 # Compile and runtime deps

Dockerfile.windows

@@ -178,7 +178,6 @@ ENV GO_VERSION=${GO_VERSION} `
     CONTAINERD_VERSION=${CONTAINERD_VERSION} `
     GIT_VERSION=2.11.1 `
     GOPATH=C:\gopath `
-    GO111MODULE=off `
     GOTOOLCHAIN=local `
     FROM_DOCKERFILE=1 `
     GOTESTSUM_VERSION=${GOTESTSUM_VERSION} `
@@ -278,13 +277,11 @@ RUN `
 
 RUN `
   Function Install-GoTestSum() { `
-    $Env:GO111MODULE = 'on'; `
     $tmpGobin = "${Env:GOBIN_TMP}"; `
     $Env:GOBIN = """${Env:GOPATH}`\bin"""; `
     Write-Host "INFO: Installing gotestsum version $Env:GOTESTSUM_VERSION in $Env:GOBIN"; `
     &go install "gotest.tools/gotestsum@${Env:GOTESTSUM_VERSION}"; `
     $Env:GOBIN = "${tmpGobin}"; `
-    $Env:GO111MODULE = 'off'; `
     if ($LASTEXITCODE -ne 0) {  `
       Throw '"gotestsum install failed..."'; `
     } `
@@ -294,13 +291,11 @@ RUN `
 
 RUN `
   Function Install-GoWinres() { `
-    $Env:GO111MODULE = 'on'; `
     $tmpGobin = "${Env:GOBIN_TMP}"; `
     $Env:GOBIN = """${Env:GOPATH}`\bin"""; `
     Write-Host "INFO: Installing go-winres version $Env:GOWINRES_VERSION in $Env:GOBIN"; `
     &go install "github.com/tc-hib/go-winres@${Env:GOWINRES_VERSION}"; `
     $Env:GOBIN = "${tmpGobin}"; `
-    $Env:GO111MODULE = 'off'; `
     if ($LASTEXITCODE -ne 0) {  `
       Throw '"go-winres install failed..."'; `
     } `

cmd/docker-proxy/main_linux.go

@@ -8,8 +8,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/docker/docker/dockerversion"
 	"github.com/ishidawataru/sctp"
+	"github.com/moby/moby/v2/dockerversion"
 	"golang.org/x/net/ipv4"
 	"golang.org/x/net/ipv6"
 )

cmd/dockerd/main.go

@@ -10,7 +10,7 @@ import (
 	"github.com/moby/sys/reexec"
 	"github.com/moby/term"
 
-	"github.com/docker/docker/daemon/command"
+	"github.com/moby/moby/v2/daemon/command"
 )
 
 func main() {

cmd/dockerd/main_windows.go

@@ -2,4 +2,4 @@
 
 package main
 
-import _ "github.com/docker/docker/cmd/dockerd/winresources"
+import _ "github.com/moby/moby/v2/cmd/dockerd/winresources"

daemon/archive.go

@@ -5,8 +5,8 @@ import (
 	"os"
 
 	cerrdefs "github.com/containerd/errdefs"
-	"github.com/docker/docker/errdefs"
 	"github.com/moby/moby/api/types/container"
+	"github.com/moby/moby/v2/errdefs"
 )
 
 // ContainerStatPath stats the filesystem resource at the specified path in the

daemon/archive_tarcopyoptions_unix.go

@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/errdefs"
 	"github.com/moby/go-archive"
+	"github.com/moby/moby/v2/daemon/container"
+	"github.com/moby/moby/v2/errdefs"
 	"github.com/moby/sys/user"
 )
 

daemon/archive_unix.go

@@ -8,13 +8,13 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/docker/docker/daemon/container"
-	volumemounts "github.com/docker/docker/daemon/volume/mounts"
-	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/ioutils"
 	"github.com/moby/go-archive"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
+	"github.com/moby/moby/v2/daemon/container"
+	volumemounts "github.com/moby/moby/v2/daemon/volume/mounts"
+	"github.com/moby/moby/v2/errdefs"
+	"github.com/moby/moby/v2/pkg/ioutils"
 	"github.com/pkg/errors"
 )
 

daemon/archive_windows.go

@@ -6,13 +6,13 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/ioutils"
 	"github.com/moby/go-archive"
 	"github.com/moby/go-archive/chrootarchive"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
+	"github.com/moby/moby/v2/daemon/container"
+	"github.com/moby/moby/v2/errdefs"
+	"github.com/moby/moby/v2/pkg/ioutils"
 )
 
 // containerStatPath stats the filesystem resource at the specified path in this

daemon/attach.go

@@ -6,14 +6,14 @@ import (
 	"io"
 
 	"github.com/containerd/log"
-	"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/pkg/stdcopy"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
+	"github.com/moby/moby/v2/daemon/container"
+	"github.com/moby/moby/v2/daemon/internal/stream"
+	"github.com/moby/moby/v2/daemon/logger"
+	"github.com/moby/moby/v2/daemon/server/backend"
+	"github.com/moby/moby/v2/errdefs"
 	"github.com/moby/term"
 	"github.com/pkg/errors"
 )

daemon/auth.go

@@ -3,8 +3,8 @@ package daemon
 import (
 	"context"
 
-	"github.com/docker/docker/dockerversion"
 	"github.com/moby/moby/api/types/registry"
+	"github.com/moby/moby/v2/dockerversion"
 )
 
 // AuthenticateToRegistry checks the validity of credentials in authConfig

daemon/builder/backend/backend.go

@@ -6,14 +6,14 @@ import (
 	"strconv"
 
 	"github.com/distribution/reference"
-	"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/daemon/internal/image"
-	"github.com/docker/docker/daemon/internal/stringid"
-	"github.com/docker/docker/daemon/server/backend"
 	"github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/events"
+	"github.com/moby/moby/v2/daemon/builder"
+	daemonevents "github.com/moby/moby/v2/daemon/events"
+	buildkit "github.com/moby/moby/v2/daemon/internal/builder-next"
+	"github.com/moby/moby/v2/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/internal/stringid"
+	"github.com/moby/moby/v2/daemon/server/backend"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 )

daemon/builder/backend/tag.go

@@ -6,7 +6,7 @@ import (
 	"io"
 
 	"github.com/distribution/reference"
-	"github.com/docker/docker/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/internal/image"
 	"github.com/pkg/errors"
 )
 

daemon/builder/builder.go

@@ -8,11 +8,11 @@ import (
 	"context"
 	"io"
 
-	containerpkg "github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/daemon/internal/image"
-	"github.com/docker/docker/daemon/internal/layer"
-	"github.com/docker/docker/daemon/server/backend"
 	"github.com/moby/moby/api/types/container"
+	containerpkg "github.com/moby/moby/v2/daemon/container"
+	"github.com/moby/moby/v2/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/internal/layer"
+	"github.com/moby/moby/v2/daemon/server/backend"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )

daemon/builder/dockerfile/builder.go

@@ -10,16 +10,16 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
-	"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/build"
 	"github.com/moby/moby/api/types/container"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/daemon/builder/remotecontext"
+	"github.com/moby/moby/v2/daemon/internal/stringid"
+	"github.com/moby/moby/v2/daemon/server/backend"
+	"github.com/moby/moby/v2/errdefs"
 	"github.com/moby/sys/user"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"

daemon/builder/dockerfile/containerbackend.go

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

daemon/builder/dockerfile/copy.go

@@ -14,15 +14,15 @@ import (
 	"time"
 
 	"github.com/containerd/log"
-	"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/daemon/internal/system"
-	"github.com/docker/docker/pkg/longpath"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/go-archive"
 	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/pkg/streamformatter"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/daemon/builder/remotecontext"
+	"github.com/moby/moby/v2/daemon/builder/remotecontext/urlutil"
+	"github.com/moby/moby/v2/daemon/internal/system"
+	"github.com/moby/moby/v2/pkg/longpath"
 	"github.com/moby/sys/symlink"
 	"github.com/moby/sys/user"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

daemon/builder/dockerfile/copy_windows.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/Microsoft/go-winio"
-	"github.com/docker/docker/daemon/internal/system"
+	"github.com/moby/moby/v2/daemon/internal/system"
 	"github.com/moby/sys/reexec"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/windows"

daemon/builder/dockerfile/dispatchers.go

@@ -16,15 +16,15 @@ import (
 	"strings"
 
 	"github.com/containerd/platforms"
-	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/daemon/internal/image"
-	"github.com/docker/docker/errdefs"
 	"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/container"
 	"github.com/moby/moby/api/types/jsonstream"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/daemon/internal/image"
+	"github.com/moby/moby/v2/errdefs"
 	"github.com/moby/sys/signal"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"

daemon/builder/dockerfile/dispatchers_test.go

@@ -8,15 +8,15 @@ import (
 	"strings"
 	"testing"
 
-	"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/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/build"
 	"github.com/moby/moby/api/types/container"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/pkg/oci"
+	"github.com/moby/moby/v2/daemon/server/backend"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )

daemon/builder/dockerfile/dispatchers_windows.go

@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/docker/daemon/internal/lazyregexp"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/moby/api/types/container"
+	"github.com/moby/moby/v2/daemon/internal/lazyregexp"
 )
 
 var pattern = lazyregexp.New(`^[a-zA-Z]:\.$`)

daemon/builder/dockerfile/evaluator.go

@@ -25,13 +25,13 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/daemon/internal/image"
-	"github.com/docker/docker/daemon/pkg/oci"
-	"github.com/docker/docker/errdefs"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/buildkit/frontend/dockerfile/shell"
 	"github.com/moby/moby/api/types/container"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/pkg/oci"
+	"github.com/moby/moby/v2/errdefs"
 	"github.com/pkg/errors"
 )
 

daemon/builder/dockerfile/evaluator_test.go

@@ -6,9 +6,9 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/docker/docker/daemon/builder/remotecontext"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/go-archive"
+	"github.com/moby/moby/v2/daemon/builder/remotecontext"
 	"github.com/moby/sys/reexec"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

daemon/builder/dockerfile/imagecontext.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
-	"github.com/docker/docker/daemon/builder"
-	dockerimage "github.com/docker/docker/daemon/internal/image"
-	"github.com/docker/docker/daemon/server/backend"
+	"github.com/moby/moby/v2/daemon/builder"
+	dockerimage "github.com/moby/moby/v2/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/server/backend"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 )

daemon/builder/dockerfile/imagecontext_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/containerd/platforms"
-	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/daemon/internal/image"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"gotest.tools/v3/assert"
 )

daemon/builder/dockerfile/imageprobe.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/builder"
 	"github.com/moby/moby/api/types/container"
+	"github.com/moby/moby/v2/daemon/builder"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 

daemon/builder/dockerfile/internals.go

@@ -12,16 +12,16 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
-	"github.com/docker/docker/daemon/builder"
-	"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/moby/go-archive"
 	"github.com/moby/go-archive/chrootarchive"
 	"github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/network"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/internal/stringid"
+	networkSettings "github.com/moby/moby/v2/daemon/network"
+	"github.com/moby/moby/v2/daemon/server/backend"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 )

daemon/builder/dockerfile/internals_test.go

@@ -7,14 +7,14 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/docker/docker/daemon/builder"
-	"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/moby/go-archive"
 	"github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/container"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/daemon/builder/remotecontext"
+	"github.com/moby/moby/v2/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/internal/layer"
+	"github.com/moby/moby/v2/daemon/server/backend"
 	"github.com/opencontainers/go-digest"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

daemon/builder/dockerfile/internals_windows.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 
 	"github.com/containerd/platforms"
-	"github.com/docker/docker/errdefs"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/jsonstream"
 	"github.com/moby/moby/api/types/mount"
+	"github.com/moby/moby/v2/errdefs"
 	"github.com/moby/sys/user"
 	"golang.org/x/sys/windows"
 )

daemon/builder/dockerfile/mockbackend_test.go

@@ -6,12 +6,12 @@ import (
 	"io"
 	"runtime"
 
-	"github.com/docker/docker/daemon/builder"
-	containerpkg "github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/daemon/internal/image"
-	"github.com/docker/docker/daemon/internal/layer"
-	"github.com/docker/docker/daemon/server/backend"
 	"github.com/moby/moby/api/types/container"
+	"github.com/moby/moby/v2/daemon/builder"
+	containerpkg "github.com/moby/moby/v2/daemon/container"
+	"github.com/moby/moby/v2/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/internal/layer"
+	"github.com/moby/moby/v2/daemon/server/backend"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )

daemon/builder/remotecontext/archive.go

@@ -5,11 +5,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/daemon/builder/remotecontext/internal/tarsum"
-	"github.com/docker/docker/pkg/longpath"
 	"github.com/moby/go-archive/chrootarchive"
 	"github.com/moby/go-archive/compression"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/daemon/builder/remotecontext/internal/tarsum"
+	"github.com/moby/moby/v2/pkg/longpath"
 	"github.com/moby/sys/symlink"
 	"github.com/pkg/errors"
 )

daemon/builder/remotecontext/detect.go

@@ -12,11 +12,11 @@ import (
 
 	"github.com/containerd/continuity/driver"
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/daemon/builder/remotecontext/urlutil"
-	"github.com/docker/docker/daemon/server/backend"
-	"github.com/docker/docker/errdefs"
 	"github.com/moby/buildkit/frontend/dockerfile/parser"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/daemon/builder/remotecontext/urlutil"
+	"github.com/moby/moby/v2/daemon/server/backend"
+	"github.com/moby/moby/v2/errdefs"
 	"github.com/moby/patternmatcher"
 	"github.com/moby/patternmatcher/ignorefile"
 	"github.com/moby/sys/symlink"

daemon/builder/remotecontext/detect_test.go

@@ -8,7 +8,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/docker/docker/daemon/builder"
+	"github.com/moby/moby/v2/daemon/builder"
 )
 
 const (

daemon/builder/remotecontext/filehash.go

@@ -6,8 +6,8 @@ import (
 	"hash"
 	"os"
 
-	"github.com/docker/docker/daemon/builder/remotecontext/internal/tarsum"
 	"github.com/moby/go-archive"
+	"github.com/moby/moby/v2/daemon/builder/remotecontext/internal/tarsum"
 )
 
 // NewFileHash returns new hash that is used for the builder cache keys

daemon/builder/remotecontext/git.go

@@ -5,9 +5,9 @@ import (
 	"os"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/daemon/builder/remotecontext/git"
 	"github.com/moby/go-archive"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/daemon/builder/remotecontext/git"
 )
 
 // MakeGitContext returns a Context from gitURL that is cloned in a temporary directory.

daemon/builder/remotecontext/git/gitutils_test.go

@@ -347,7 +347,7 @@ func TestValidGitTransport(t *testing.T) {
 		"http://github.com/docker/docker.git#:dir",
 	}
 	incompleteGitUrls := []string{
-		"github.com/docker/docker",
+		"github.com/moby/moby/v2",
 	}
 
 	for _, u := range gitUrls {

daemon/builder/remotecontext/lazycontext.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/pkg/pools"
+	"github.com/moby/moby/v2/daemon/builder"
+	"github.com/moby/moby/v2/pkg/pools"
 	"github.com/pkg/errors"
 )
 

daemon/builder/remotecontext/remote.go

@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/docker/docker/daemon/internal/lazyregexp"
-	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/ioutils"
+	"github.com/moby/moby/v2/daemon/internal/lazyregexp"
+	"github.com/moby/moby/v2/errdefs"
+	"github.com/moby/moby/v2/pkg/ioutils"
 	"github.com/pkg/errors"
 )
 

daemon/builder/remotecontext/remote_test.go

@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/docker/docker/daemon/builder"
+	"github.com/moby/moby/v2/daemon/builder"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )

daemon/builder/remotecontext/tarsum_test.go

@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/docker/docker/daemon/builder"
 	"github.com/moby/go-archive"
+	"github.com/moby/moby/v2/daemon/builder"
 	"github.com/moby/sys/reexec"
 	"github.com/pkg/errors"
 	"gotest.tools/v3/skip"

daemon/builder/remotecontext/urlutil/urlutil.go

@@ -8,7 +8,7 @@ package urlutil
 import (
 	"strings"
 
-	"github.com/docker/docker/daemon/internal/lazyregexp"
+	"github.com/moby/moby/v2/daemon/internal/lazyregexp"
 )
 
 // urlPathWithFragmentSuffix matches fragments to use as Git reference and build

daemon/builder/remotecontext/urlutil/urlutil_test.go

@@ -13,7 +13,7 @@ var (
 		"http://github.com/docker/docker.git#:dir",
 	}
 	incompleteGitUrls = []string{
-		"github.com/docker/docker",
+		"github.com/moby/moby/v2",
 	}
 	invalidGitUrls = []string{
 		"http://github.com/docker/docker.git:#branch",

daemon/cdi.go

@@ -6,10 +6,10 @@ import (
 	"os"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/errdefs"
 	"github.com/hashicorp/go-multierror"
 	"github.com/moby/moby/api/types/system"
+	"github.com/moby/moby/v2/daemon/config"
+	"github.com/moby/moby/v2/errdefs"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 	"tags.cncf.io/container-device-interface/pkg/cdi"

daemon/changes.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"time"
 
-	"github.com/docker/docker/daemon/internal/metrics"
 	"github.com/moby/go-archive"
+	"github.com/moby/moby/v2/daemon/internal/metrics"
 )
 
 // ContainerChanges returns a list of container fs changes

daemon/checkpoint.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/docker/docker/daemon/names"
 	"github.com/moby/moby/api/types/checkpoint"
 	"github.com/moby/moby/api/types/events"
+	"github.com/moby/moby/v2/daemon/names"
 )
 
 var (

daemon/cluster.go

@@ -1,9 +1,9 @@
 package daemon
 
 import (
-	lncluster "github.com/docker/docker/daemon/libnetwork/cluster"
 	"github.com/moby/moby/api/types/filters"
 	"github.com/moby/moby/api/types/network"
+	lncluster "github.com/moby/moby/v2/daemon/libnetwork/cluster"
 )
 
 // Cluster is the interface for github.com/docker/docker/daemon/cluster.(*Cluster).

daemon/cluster/cluster.go

@@ -50,12 +50,12 @@ import (
 	"time"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/cluster/controllers/plugin"
-	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	"github.com/docker/docker/daemon/internal/stack"
-	lncluster "github.com/docker/docker/daemon/libnetwork/cluster"
 	"github.com/moby/moby/api/types/network"
 	types "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/controllers/plugin"
+	executorpkg "github.com/moby/moby/v2/daemon/cluster/executor"
+	"github.com/moby/moby/v2/daemon/internal/stack"
+	lncluster "github.com/moby/moby/v2/daemon/libnetwork/cluster"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	swarmnode "github.com/moby/swarmkit/v2/node"
 	"github.com/pkg/errors"

daemon/cluster/configs.go

@@ -3,8 +3,8 @@ package cluster
 import (
 	"context"
 
-	"github.com/docker/docker/daemon/cluster/convert"
 	types "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"google.golang.org/grpc"
 )

daemon/cluster/controllers/plugin/controller.go

@@ -8,14 +8,14 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
-	"github.com/docker/docker/daemon/cluster/internal/runtime"
-	"github.com/docker/docker/daemon/pkg/plugin"
-	v2 "github.com/docker/docker/daemon/pkg/plugin/v2"
-	"github.com/docker/docker/daemon/server/backend"
 	"github.com/gogo/protobuf/proto"
 	"github.com/moby/moby/api/types"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/internal/runtime"
+	"github.com/moby/moby/v2/daemon/pkg/plugin"
+	v2 "github.com/moby/moby/v2/daemon/pkg/plugin/v2"
+	"github.com/moby/moby/v2/daemon/server/backend"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/pkg/errors"
 )

daemon/cluster/controllers/plugin/controller_test.go

@@ -11,12 +11,12 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
-	"github.com/docker/docker/daemon/pkg/plugin"
-	v2 "github.com/docker/docker/daemon/pkg/plugin/v2"
-	"github.com/docker/docker/daemon/server/backend"
 	"github.com/moby/moby/api/types"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/pkg/plugin"
+	v2 "github.com/moby/moby/v2/daemon/pkg/plugin/v2"
+	"github.com/moby/moby/v2/daemon/server/backend"
 	"github.com/moby/pubsub"
 	"github.com/sirupsen/logrus"
 )

daemon/cluster/convert/network.go

@@ -3,10 +3,10 @@ package convert
 import (
 	"strings"
 
-	"github.com/docker/docker/daemon/libnetwork/scope"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/moby/api/types/network"
 	types "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/libnetwork/scope"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 )
 

daemon/cluster/convert/pluginadapter.go

@@ -1,7 +1,7 @@
 package convert
 
 import (
-	"github.com/docker/docker/pkg/plugingetter"
+	"github.com/moby/moby/v2/pkg/plugingetter"
 	"github.com/moby/swarmkit/v2/node/plugin"
 )
 

daemon/cluster/convert/service.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/daemon/cluster/internal/runtime"
-	"github.com/docker/docker/pkg/namesgenerator"
 	"github.com/gogo/protobuf/proto"
 	gogotypes "github.com/gogo/protobuf/types"
 	types "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/internal/runtime"
+	"github.com/moby/moby/v2/pkg/namesgenerator"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/api/genericresource"
 	"github.com/pkg/errors"

daemon/cluster/executor/backend.go

@@ -7,16 +7,6 @@ import (
 
 	"github.com/distribution/reference"
 	"github.com/docker/distribution"
-	clustertypes "github.com/docker/docker/daemon/cluster/provider"
-	containerpkg "github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/daemon/internal/image"
-	"github.com/docker/docker/daemon/libnetwork"
-	"github.com/docker/docker/daemon/libnetwork/cluster"
-	networktypes "github.com/docker/docker/daemon/libnetwork/types"
-	networkSettings "github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/daemon/pkg/plugin"
-	"github.com/docker/docker/daemon/server/backend"
-	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/moby/api/types/filters"
@@ -25,6 +15,16 @@ import (
 	"github.com/moby/moby/api/types/swarm"
 	"github.com/moby/moby/api/types/system"
 	"github.com/moby/moby/api/types/volume"
+	clustertypes "github.com/moby/moby/v2/daemon/cluster/provider"
+	containerpkg "github.com/moby/moby/v2/daemon/container"
+	"github.com/moby/moby/v2/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/libnetwork"
+	"github.com/moby/moby/v2/daemon/libnetwork/cluster"
+	networktypes "github.com/moby/moby/v2/daemon/libnetwork/types"
+	networkSettings "github.com/moby/moby/v2/daemon/network"
+	"github.com/moby/moby/v2/daemon/pkg/plugin"
+	"github.com/moby/moby/v2/daemon/server/backend"
+	volumeopts "github.com/moby/moby/v2/daemon/volume/service/opts"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )

daemon/cluster/executor/container/adapter.go

@@ -13,19 +13,19 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/daemon/cluster/convert"
-	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	containerpkg "github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/daemon/libnetwork"
-	networkSettings "github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/daemon/server/backend"
-	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 	gogotypes "github.com/gogo/protobuf/types"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/moby/api/types/network"
 	"github.com/moby/moby/api/types/registry"
+	"github.com/moby/moby/v2/daemon"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
+	executorpkg "github.com/moby/moby/v2/daemon/cluster/executor"
+	containerpkg "github.com/moby/moby/v2/daemon/container"
+	"github.com/moby/moby/v2/daemon/libnetwork"
+	networkSettings "github.com/moby/moby/v2/daemon/network"
+	"github.com/moby/moby/v2/daemon/server/backend"
+	volumeopts "github.com/moby/moby/v2/daemon/volume/service/opts"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"
 	swarmlog "github.com/moby/swarmkit/v2/log"

daemon/cluster/executor/container/adapter_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/daemon"
+	"github.com/moby/moby/v2/daemon"
 	"github.com/moby/swarmkit/v2/api"
 )
 

daemon/cluster/executor/container/attachment.go

@@ -3,7 +3,7 @@ package container
 import (
 	"context"
 
-	executorpkg "github.com/docker/docker/daemon/cluster/executor"
+	executorpkg "github.com/moby/moby/v2/daemon/cluster/executor"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"
 )

daemon/cluster/executor/container/container.go

@@ -10,10 +10,6 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
-	"github.com/docker/docker/daemon/cluster/convert"
-	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	clustertypes "github.com/docker/docker/daemon/cluster/provider"
-	"github.com/docker/docker/daemon/libnetwork/scope"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
@@ -21,6 +17,10 @@ import (
 	enginemount "github.com/moby/moby/api/types/mount"
 	"github.com/moby/moby/api/types/network"
 	"github.com/moby/moby/api/types/volume"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
+	executorpkg "github.com/moby/moby/v2/daemon/cluster/executor"
+	clustertypes "github.com/moby/moby/v2/daemon/cluster/provider"
+	"github.com/moby/moby/v2/daemon/libnetwork/scope"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/api/genericresource"

daemon/cluster/executor/container/controller.go

@@ -9,11 +9,11 @@ import (
 	"time"
 
 	cerrdefs "github.com/containerd/errdefs"
-	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	"github.com/docker/docker/daemon/libnetwork"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
+	executorpkg "github.com/moby/moby/v2/daemon/cluster/executor"
+	"github.com/moby/moby/v2/daemon/libnetwork"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/log"

daemon/cluster/executor/container/executor.go

@@ -8,15 +8,15 @@ import (
 	"sync"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/cluster/controllers/plugin"
-	"github.com/docker/docker/daemon/cluster/convert"
-	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	clustertypes "github.com/docker/docker/daemon/cluster/provider"
-	"github.com/docker/docker/daemon/libnetwork"
-	networktypes "github.com/docker/docker/daemon/libnetwork/types"
 	"github.com/moby/moby/api/types/filters"
 	"github.com/moby/moby/api/types/network"
 	swarmtypes "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/controllers/plugin"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
+	executorpkg "github.com/moby/moby/v2/daemon/cluster/executor"
+	clustertypes "github.com/moby/moby/v2/daemon/cluster/provider"
+	"github.com/moby/moby/v2/daemon/libnetwork"
+	networktypes "github.com/moby/moby/v2/daemon/libnetwork/types"
 	"github.com/moby/swarmkit/v2/agent"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"

daemon/cluster/executor/container/health_test.go

@@ -8,11 +8,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/daemon/events"
 	containertypes "github.com/moby/moby/api/types/container"
 	eventtypes "github.com/moby/moby/api/types/events"
+	"github.com/moby/moby/v2/daemon"
+	"github.com/moby/moby/v2/daemon/container"
+	"github.com/moby/moby/v2/daemon/events"
 	"github.com/moby/swarmkit/v2/api"
 )
 

daemon/cluster/executor/container/validate_test.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/daemon/internal/stringid"
+	"github.com/moby/moby/v2/daemon"
+	"github.com/moby/moby/v2/daemon/internal/stringid"
 	"github.com/moby/swarmkit/v2/api"
 )
 

daemon/cluster/helpers.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/docker/docker/errdefs"
+	"github.com/moby/moby/v2/errdefs"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"github.com/pkg/errors"
 )

daemon/cluster/listen_addr_linux.go

@@ -3,7 +3,7 @@ package cluster
 import (
 	"net"
 
-	"github.com/docker/docker/daemon/libnetwork/nlwrap"
+	"github.com/moby/moby/v2/daemon/libnetwork/nlwrap"
 	"github.com/vishvananda/netlink"
 )
 

daemon/cluster/networks.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/cluster/convert"
-	networkSettings "github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/errdefs"
 	"github.com/moby/moby/api/types/filters"
 	"github.com/moby/moby/api/types/network"
 	types "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
+	networkSettings "github.com/moby/moby/v2/daemon/network"
+	"github.com/moby/moby/v2/errdefs"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"github.com/pkg/errors"
 )

daemon/cluster/noderunner.go

@@ -9,11 +9,11 @@ import (
 	"time"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/cluster/convert"
-	"github.com/docker/docker/daemon/cluster/executor/container"
-	lncluster "github.com/docker/docker/daemon/libnetwork/cluster"
-	"github.com/docker/docker/daemon/libnetwork/cnmallocator"
 	types "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
+	"github.com/moby/moby/v2/daemon/cluster/executor/container"
+	lncluster "github.com/moby/moby/v2/daemon/libnetwork/cluster"
+	"github.com/moby/moby/v2/daemon/libnetwork/cnmallocator"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"
 	swarmnode "github.com/moby/swarmkit/v2/node"

daemon/cluster/nodes.go

@@ -3,9 +3,9 @@ package cluster
 import (
 	"context"
 
-	"github.com/docker/docker/daemon/cluster/convert"
-	"github.com/docker/docker/errdefs"
 	types "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
+	"github.com/moby/moby/v2/errdefs"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"google.golang.org/grpc"
 )

daemon/cluster/secrets.go

@@ -3,8 +3,8 @@ package cluster
 import (
 	"context"
 
-	"github.com/docker/docker/daemon/cluster/convert"
 	types "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"google.golang.org/grpc"
 )

daemon/cluster/services.go

@@ -13,14 +13,14 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
-	"github.com/docker/docker/daemon/cluster/convert"
-	"github.com/docker/docker/daemon/server/backend"
-	"github.com/docker/docker/errdefs"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/moby/moby/api/types/swarm"
 	timetypes "github.com/moby/moby/api/types/time"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
+	"github.com/moby/moby/v2/daemon/server/backend"
+	"github.com/moby/moby/v2/errdefs"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"

daemon/cluster/swarm.go

@@ -8,14 +8,14 @@ import (
 	"time"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/cluster/convert"
-	"github.com/docker/docker/daemon/internal/stack"
-	"github.com/docker/docker/daemon/pkg/opts"
-	"github.com/docker/docker/daemon/server/backend"
-	"github.com/docker/docker/errdefs"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/filters"
 	types "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
+	"github.com/moby/moby/v2/daemon/internal/stack"
+	"github.com/moby/moby/v2/daemon/pkg/opts"
+	"github.com/moby/moby/v2/daemon/server/backend"
+	"github.com/moby/moby/v2/errdefs"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/manager/encryption"
 	swarmnode "github.com/moby/swarmkit/v2/node"

daemon/cluster/tasks.go

@@ -3,9 +3,9 @@ package cluster
 import (
 	"context"
 
-	"github.com/docker/docker/daemon/cluster/convert"
 	"github.com/moby/moby/api/types/filters"
 	types "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"google.golang.org/grpc"
 )

daemon/cluster/volumes.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	cerrdefs "github.com/containerd/errdefs"
-	"github.com/docker/docker/daemon/cluster/convert"
-	"github.com/docker/docker/errdefs"
 	volumetypes "github.com/moby/moby/api/types/volume"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
+	"github.com/moby/moby/v2/errdefs"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"google.golang.org/grpc"
 )

daemon/command/config.go

@@ -3,10 +3,10 @@ package command
 import (
 	"runtime"
 
-	"github.com/docker/docker/daemon/config"
-	dopts "github.com/docker/docker/daemon/internal/opts"
-	"github.com/docker/docker/daemon/pkg/opts"
-	"github.com/docker/docker/daemon/pkg/registry"
+	"github.com/moby/moby/v2/daemon/config"
+	dopts "github.com/moby/moby/v2/daemon/internal/opts"
+	"github.com/moby/moby/v2/daemon/pkg/opts"
+	"github.com/moby/moby/v2/daemon/pkg/registry"
 	"github.com/spf13/pflag"
 )
 

daemon/command/config_unix.go

@@ -5,8 +5,8 @@ package command
 import (
 	"net"
 
-	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/daemon/pkg/opts"
+	"github.com/moby/moby/v2/daemon/config"
+	"github.com/moby/moby/v2/daemon/pkg/opts"
 	"github.com/spf13/pflag"
 )
 

daemon/command/config_unix_test.go

@@ -5,7 +5,7 @@ package command
 import (
 	"testing"
 
-	"github.com/docker/docker/daemon/config"
+	"github.com/moby/moby/v2/daemon/config"
 	"github.com/spf13/pflag"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

daemon/command/config_windows.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/docker/docker/daemon/config"
+	"github.com/moby/moby/v2/daemon/config"
 	"github.com/spf13/pflag"
 )
 

daemon/command/daemon.go

@@ -18,45 +18,45 @@ import (
 	containerddefaults "github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/pkg/tracing"
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon"
-	buildbackend "github.com/docker/docker/daemon/builder/backend"
-	"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"
-	"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/internal/otelutil"
-	"github.com/docker/docker/daemon/internal/rootless"
-	"github.com/docker/docker/daemon/listeners"
-	dopts "github.com/docker/docker/daemon/pkg/opts"
-	"github.com/docker/docker/daemon/pkg/plugin"
-	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/pkg/authorization"
-	"github.com/docker/docker/pkg/homedir"
-	"github.com/docker/docker/pkg/pidfile"
-	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/go-connections/tlsconfig"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/util/tracing/detect"
+	"github.com/moby/moby/v2/daemon"
+	buildbackend "github.com/moby/moby/v2/daemon/builder/backend"
+	"github.com/moby/moby/v2/daemon/builder/dockerfile"
+	"github.com/moby/moby/v2/daemon/cluster"
+	"github.com/moby/moby/v2/daemon/command/debug"
+	"github.com/moby/moby/v2/daemon/command/trap"
+	"github.com/moby/moby/v2/daemon/config"
+	buildkit "github.com/moby/moby/v2/daemon/internal/builder-next"
+	"github.com/moby/moby/v2/daemon/internal/builder-next/exporter"
+	"github.com/moby/moby/v2/daemon/internal/libcontainerd/supervisor"
+	"github.com/moby/moby/v2/daemon/internal/otelutil"
+	"github.com/moby/moby/v2/daemon/internal/rootless"
+	"github.com/moby/moby/v2/daemon/listeners"
+	dopts "github.com/moby/moby/v2/daemon/pkg/opts"
+	"github.com/moby/moby/v2/daemon/pkg/plugin"
+	apiserver "github.com/moby/moby/v2/daemon/server"
+	"github.com/moby/moby/v2/daemon/server/middleware"
+	"github.com/moby/moby/v2/daemon/server/router"
+	"github.com/moby/moby/v2/daemon/server/router/build"
+	checkpointrouter "github.com/moby/moby/v2/daemon/server/router/checkpoint"
+	"github.com/moby/moby/v2/daemon/server/router/container"
+	debugrouter "github.com/moby/moby/v2/daemon/server/router/debug"
+	distributionrouter "github.com/moby/moby/v2/daemon/server/router/distribution"
+	grpcrouter "github.com/moby/moby/v2/daemon/server/router/grpc"
+	"github.com/moby/moby/v2/daemon/server/router/image"
+	"github.com/moby/moby/v2/daemon/server/router/network"
+	pluginrouter "github.com/moby/moby/v2/daemon/server/router/plugin"
+	sessionrouter "github.com/moby/moby/v2/daemon/server/router/session"
+	swarmrouter "github.com/moby/moby/v2/daemon/server/router/swarm"
+	systemrouter "github.com/moby/moby/v2/daemon/server/router/system"
+	"github.com/moby/moby/v2/daemon/server/router/volume"
+	"github.com/moby/moby/v2/dockerversion"
+	"github.com/moby/moby/v2/pkg/authorization"
+	"github.com/moby/moby/v2/pkg/homedir"
+	"github.com/moby/moby/v2/pkg/pidfile"
+	"github.com/moby/moby/v2/pkg/plugingetter"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"

daemon/command/daemon_freebsd.go

@@ -1,6 +1,6 @@
 package command
 
-import "github.com/docker/docker/daemon/config"
+import "github.com/moby/moby/v2/daemon/config"
 
 // preNotifyReady sends a message to the host when the API is active, but before the daemon is
 func preNotifyReady() error {

daemon/command/daemon_linux.go

@@ -3,9 +3,9 @@ package command
 import (
 	cdcgroups "github.com/containerd/cgroups/v3"
 	systemdDaemon "github.com/coreos/go-systemd/v22/daemon"
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/pkg/sysinfo"
+	"github.com/moby/moby/v2/daemon"
+	"github.com/moby/moby/v2/daemon/config"
+	"github.com/moby/moby/v2/pkg/sysinfo"
 	"github.com/pkg/errors"
 )
 

daemon/command/daemon_linux_test.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/docker/docker/daemon/config"
+	"github.com/moby/moby/v2/daemon/config"
 	"github.com/moby/sys/reexec"
 	"golang.org/x/sys/unix"
 	"gotest.tools/v3/assert"

daemon/command/daemon_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/config"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/moby/moby/v2/daemon/config"
 	"github.com/spf13/pflag"
 	"go.opentelemetry.io/otel"
 	"gotest.tools/v3/assert"

daemon/command/daemon_unix.go

@@ -11,10 +11,10 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/daemon/libnetwork/portallocator"
-	"github.com/docker/docker/pkg/homedir"
+	"github.com/moby/moby/v2/daemon"
+	"github.com/moby/moby/v2/daemon/config"
+	"github.com/moby/moby/v2/daemon/libnetwork/portallocator"
+	"github.com/moby/moby/v2/pkg/homedir"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 )

daemon/command/daemon_unix_test.go

@@ -5,7 +5,7 @@ package command
 import (
 	"testing"
 
-	"github.com/docker/docker/daemon/config"
+	"github.com/moby/moby/v2/daemon/config"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 	"gotest.tools/v3/fs"

daemon/command/daemon_windows.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/daemon/internal/libcontainerd"
+	"github.com/moby/moby/v2/daemon/config"
+	"github.com/moby/moby/v2/daemon/internal/libcontainerd"
 	"golang.org/x/sys/windows"
 )
 

daemon/command/docker.go

@@ -6,10 +6,10 @@ import (
 	"io"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/daemon/internal/rootless"
-	"github.com/docker/docker/dockerversion"
 	"github.com/moby/buildkit/util/apicaps"
+	"github.com/moby/moby/v2/daemon/config"
+	"github.com/moby/moby/v2/daemon/internal/rootless"
+	"github.com/moby/moby/v2/dockerversion"
 	"github.com/spf13/cobra"
 )
 

daemon/command/options.go

@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/daemon/pkg/opts"
-	"github.com/docker/docker/pkg/homedir"
 	"github.com/docker/go-connections/tlsconfig"
+	"github.com/moby/moby/v2/daemon/config"
+	"github.com/moby/moby/v2/daemon/pkg/opts"
+	"github.com/moby/moby/v2/pkg/homedir"
 	"github.com/spf13/pflag"
 )
 

daemon/command/options_test.go

@@ -4,7 +4,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/docker/docker/daemon/config"
+	"github.com/moby/moby/v2/daemon/config"
 	"github.com/spf13/pflag"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

daemon/command/trap/testfiles/main.go

@@ -5,7 +5,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/docker/docker/daemon/command/trap"
+	"github.com/moby/moby/v2/daemon/command/trap"
 )
 
 func main() {

daemon/commit.go

@@ -8,12 +8,12 @@ import (
 	"time"
 
 	"github.com/distribution/reference"
-	"github.com/docker/docker/daemon/builder/dockerfile"
-	"github.com/docker/docker/daemon/internal/metrics"
-	"github.com/docker/docker/daemon/server/backend"
-	"github.com/docker/docker/errdefs"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
+	"github.com/moby/moby/v2/daemon/builder/dockerfile"
+	"github.com/moby/moby/v2/daemon/internal/metrics"
+	"github.com/moby/moby/v2/daemon/server/backend"
+	"github.com/moby/moby/v2/errdefs"
 	"github.com/pkg/errors"
 )
 

daemon/config/config.go

@@ -13,11 +13,11 @@ import (
 
 	"dario.cat/mergo"
 	"github.com/containerd/log"
-	dopts "github.com/docker/docker/daemon/internal/opts"
-	"github.com/docker/docker/daemon/pkg/opts"
-	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/moby/moby/api"
 	"github.com/moby/moby/api/types/versions"
+	dopts "github.com/moby/moby/v2/daemon/internal/opts"
+	"github.com/moby/moby/v2/daemon/pkg/opts"
+	"github.com/moby/moby/v2/daemon/pkg/registry"
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 	"golang.org/x/text/encoding"

daemon/config/config_linux.go

@@ -11,12 +11,12 @@ import (
 
 	"github.com/containerd/cgroups/v3"
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/internal/rootless"
-	"github.com/docker/docker/daemon/libnetwork/drivers/bridge"
-	"github.com/docker/docker/daemon/pkg/opts"
-	"github.com/docker/docker/pkg/homedir"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/system"
+	"github.com/moby/moby/v2/daemon/internal/rootless"
+	"github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge"
+	"github.com/moby/moby/v2/daemon/pkg/opts"
+	"github.com/moby/moby/v2/pkg/homedir"
 	"github.com/pkg/errors"
 )
 

daemon/config/config_linux_test.go

@@ -4,10 +4,10 @@ import (
 	"net/netip"
 	"testing"
 
-	dopts "github.com/docker/docker/daemon/internal/opts"
-	"github.com/docker/docker/daemon/pkg/opts"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/moby/moby/api/types/container"
+	dopts "github.com/moby/moby/v2/daemon/internal/opts"
+	"github.com/moby/moby/v2/daemon/pkg/opts"
 	"github.com/spf13/pflag"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

daemon/config/config_test.go

@@ -11,11 +11,11 @@ import (
 	"testing"
 
 	"dario.cat/mergo"
-	"github.com/docker/docker/daemon/libnetwork/ipamutils"
-	"github.com/docker/docker/daemon/pkg/opts"
-	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/moby/moby/v2/daemon/libnetwork/ipamutils"
+	"github.com/moby/moby/v2/daemon/pkg/opts"
+	"github.com/moby/moby/v2/daemon/pkg/registry"
 	"github.com/spf13/pflag"
 	"golang.org/x/text/encoding"
 	"golang.org/x/text/encoding/unicode"

daemon/config/config_windows_test.go

@@ -3,7 +3,7 @@ package config
 import (
 	"testing"
 
-	"github.com/docker/docker/daemon/pkg/opts"
+	"github.com/moby/moby/v2/daemon/pkg/opts"
 	"github.com/spf13/pflag"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

daemon/config/opts.go

@@ -1,8 +1,8 @@
 package config
 
 import (
-	"github.com/docker/docker/daemon/cluster/convert"
 	"github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/cluster/convert"
 	"github.com/moby/swarmkit/v2/api/genericresource"
 )
 

daemon/container.go

@@ -15,18 +15,18 @@ import (
 	"time"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/daemon/internal/image"
-	"github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/daemon/pkg/oci/caps"
-	"github.com/docker/docker/daemon/pkg/opts"
-	volumemounts "github.com/docker/docker/daemon/volume/mounts"
-	"github.com/docker/docker/errdefs"
 	"github.com/docker/go-connections/nat"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/mount"
 	networktypes "github.com/moby/moby/api/types/network"
+	"github.com/moby/moby/v2/daemon/config"
+	"github.com/moby/moby/v2/daemon/container"
+	"github.com/moby/moby/v2/daemon/internal/image"
+	"github.com/moby/moby/v2/daemon/network"
+	"github.com/moby/moby/v2/daemon/pkg/oci/caps"
+	"github.com/moby/moby/v2/daemon/pkg/opts"
+	volumemounts "github.com/moby/moby/v2/daemon/volume/mounts"
+	"github.com/moby/moby/v2/errdefs"
 	"github.com/moby/sys/signal"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/opencontainers/selinux/go-selinux"

daemon/container/container.go

@@ -17,24 +17,24 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
-	"github.com/docker/docker/daemon/internal/image"
-	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"
-	"github.com/docker/docker/daemon/internal/restartmanager"
-	"github.com/docker/docker/daemon/internal/stream"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/daemon/logger/jsonfilelog"
-	"github.com/docker/docker/daemon/logger/local"
-	"github.com/docker/docker/daemon/logger/loggerutils/cache"
-	"github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/daemon/pkg/oci"
-	"github.com/docker/docker/daemon/volume"
-	volumemounts "github.com/docker/docker/daemon/volume/mounts"
-	"github.com/docker/docker/errdefs"
 	"github.com/docker/go-units"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
 	mounttypes "github.com/moby/moby/api/types/mount"
 	swarmtypes "github.com/moby/moby/api/types/swarm"
+	"github.com/moby/moby/v2/daemon/internal/image"
+	libcontainerdtypes "github.com/moby/moby/v2/daemon/internal/libcontainerd/types"
+	"github.com/moby/moby/v2/daemon/internal/restartmanager"
+	"github.com/moby/moby/v2/daemon/internal/stream"
+	"github.com/moby/moby/v2/daemon/logger"
+	"github.com/moby/moby/v2/daemon/logger/jsonfilelog"
+	"github.com/moby/moby/v2/daemon/logger/local"
+	"github.com/moby/moby/v2/daemon/logger/loggerutils/cache"
+	"github.com/moby/moby/v2/daemon/network"
+	"github.com/moby/moby/v2/daemon/pkg/oci"
+	"github.com/moby/moby/v2/daemon/volume"
+	volumemounts "github.com/moby/moby/v2/daemon/volume/mounts"
+	"github.com/moby/moby/v2/errdefs"
 	agentexec "github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/sys/atomicwriter"
 	"github.com/moby/sys/signal"