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

Create github.com/moby/moby/v2 module

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2025-07-31 10:13:29 -07:00
parent a954a0f4a2
commit f74e5d48b3
1013 changed files with 8199 additions and 2743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/docker-proxy/main_linux.go
View File

@@ -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"
)

2
cmd/dockerd/main.go
View File

@@ -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() {

2
cmd/dockerd/main_windows.go
View File

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

2
daemon/archive.go
View File

@@ -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

4
daemon/archive_tarcopyoptions_unix.go
View File

@@ -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"
)

8
daemon/archive_unix.go
View File

@@ -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"
)

6
daemon/archive_windows.go
View File

@@ -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

10
daemon/attach.go
View File

@@ -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"
)

2
daemon/auth.go
View File

@@ -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

12
daemon/builder/backend/backend.go
View File

@@ -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"
)

2
daemon/builder/backend/tag.go
View File

@@ -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"
)

8
daemon/builder/builder.go
View File

@@ -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"
)

10
daemon/builder/dockerfile/builder.go
View File

@@ -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"

6
daemon/builder/dockerfile/containerbackend.go
View File

@@ -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"
)

10
daemon/builder/dockerfile/copy.go
View File

@@ -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"

2
daemon/builder/dockerfile/copy_windows.go
View File

@@ -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"

6
daemon/builder/dockerfile/dispatchers.go
View File

@@ -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"

8
daemon/builder/dockerfile/dispatchers_test.go
View File

@@ -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"
)

2
daemon/builder/dockerfile/dispatchers_windows.go
View File

@@ -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]:\.$`)

8
daemon/builder/dockerfile/evaluator.go
View File

@@ -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"
)

2
daemon/builder/dockerfile/evaluator_test.go
View File

@@ -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"

6
daemon/builder/dockerfile/imagecontext.go
View File

@@ -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"
)

4
daemon/builder/dockerfile/imagecontext_test.go
View File

@@ -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"
)

2
daemon/builder/dockerfile/imageprobe.go
View File

@@ -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"
)

10
daemon/builder/dockerfile/internals.go
View File

@@ -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"
)

10
daemon/builder/dockerfile/internals_test.go
View File

@@ -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"

2
daemon/builder/dockerfile/internals_windows.go
View File

@@ -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"
)

10
daemon/builder/dockerfile/mockbackend_test.go
View File

@@ -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"
)

6
daemon/builder/remotecontext/archive.go
View File

@@ -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"
)

8
daemon/builder/remotecontext/detect.go
View File

@@ -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"

2
daemon/builder/remotecontext/detect_test.go
View File

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

2
daemon/builder/remotecontext/filehash.go
View File

@@ -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

4
daemon/builder/remotecontext/git.go
View File

@@ -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.

2
daemon/builder/remotecontext/git/gitutils_test.go
View File

@@ -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 {

4
daemon/builder/remotecontext/lazycontext.go
View File

@@ -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"
)

6
daemon/builder/remotecontext/remote.go
View File

@@ -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"
)

2
daemon/builder/remotecontext/remote_test.go
View File

@@ -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"
)

2
daemon/builder/remotecontext/tarsum_test.go
View File

@@ -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"

2
daemon/builder/remotecontext/urlutil/urlutil.go
View File

@@ -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

2
daemon/builder/remotecontext/urlutil/urlutil_test.go
View File

@@ -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",

4
daemon/cdi.go
View File

@@ -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"

2
daemon/changes.go
View File

@@ -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

2
daemon/checkpoint.go
View File

@@ -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 (

2
daemon/cluster.go
View File

@@ -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).

8
daemon/cluster/cluster.go
View File

@@ -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"

2
daemon/cluster/configs.go
View File

@@ -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"
)

8
daemon/cluster/controllers/plugin/controller.go
View File

@@ -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"
)

6
daemon/cluster/controllers/plugin/controller_test.go
View File

@@ -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"
)

2
daemon/cluster/convert/network.go
View File

@@ -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"
)

2
daemon/cluster/convert/pluginadapter.go
View File

@@ -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"
)

4
daemon/cluster/convert/service.go
View File

@@ -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"

20
daemon/cluster/executor/backend.go
View File

@@ -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"
)

16
daemon/cluster/executor/container/adapter.go
View File

@@ -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"

2
daemon/cluster/executor/container/adapter_test.go
View File

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

2
daemon/cluster/executor/container/attachment.go
View File

@@ -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"
)

8
daemon/cluster/executor/container/container.go
View File

@@ -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"

4
daemon/cluster/executor/container/controller.go
View File

@@ -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"

12
daemon/cluster/executor/container/executor.go
View File

@@ -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"

6
daemon/cluster/executor/container/health_test.go
View File

@@ -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"
)

4
daemon/cluster/executor/container/validate_test.go
View File

@@ -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"
)

2
daemon/cluster/helpers.go
View File

@@ -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"
)

2
daemon/cluster/listen_addr_linux.go
View File

@@ -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"
)

6
daemon/cluster/networks.go
View File

@@ -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"
)

8
daemon/cluster/noderunner.go
View File

@@ -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"

4
daemon/cluster/nodes.go
View File

@@ -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"
)

2
daemon/cluster/secrets.go
View File

@@ -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"
)

6
daemon/cluster/services.go
View File

@@ -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"

10
daemon/cluster/swarm.go
View File

@@ -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"

2
daemon/cluster/tasks.go
View File

@@ -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"
)

4
daemon/cluster/volumes.go
View File

@@ -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"
)

8
daemon/command/config.go
View File

@@ -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"
)

4
daemon/command/config_unix.go
View File

@@ -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"
)

2
daemon/command/config_unix_test.go
View File

@@ -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"

2
daemon/command/config_windows.go
View File

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

72
daemon/command/daemon.go
View File

@@ -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"

2
daemon/command/daemon_freebsd.go
View File

@@ -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 {

6
daemon/command/daemon_linux.go
View File

@@ -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"
)

2
daemon/command/daemon_linux_test.go
View File

@@ -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"

2
daemon/command/daemon_test.go
View File

@@ -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"

8
daemon/command/daemon_unix.go
View File

@@ -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"
)

2
daemon/command/daemon_unix_test.go
View File

@@ -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"

4
daemon/command/daemon_windows.go
View File

@@ -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"
)

6
daemon/command/docker.go
View File

@@ -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"
)

6
daemon/command/options.go
View File

@@ -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"
)

2
daemon/command/options_test.go
View File

@@ -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"

2
daemon/command/trap/testfiles/main.go
View File

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

8
daemon/commit.go
View File

@@ -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"
)

6
daemon/config/config.go
View File

@@ -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"

8
daemon/config/config_linux.go
View File

@@ -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"
)

4
daemon/config/config_linux_test.go
View File

@@ -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"

6
daemon/config/config_test.go
View File

@@ -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"

2
daemon/config/config_windows_test.go
View File

@@ -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"

2
daemon/config/opts.go
View File

@@ -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"
)

16
daemon/container.go
View File

@@ -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"

26
daemon/container/container.go
View File

@@ -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"

2
daemon/container/container_test.go
View File

@@ -6,9 +6,9 @@ import (
"syscall"
"testing"
"github.com/docker/docker/daemon/logger/jsonfilelog"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/swarm"
"github.com/moby/moby/v2/daemon/logger/jsonfilelog"
"gotest.tools/v3/assert"
)

2
daemon/container/container_unix.go
View File

@@ -10,11 +10,11 @@ import (
"github.com/containerd/continuity/fs"
"github.com/containerd/log"
volumemounts "github.com/docker/docker/daemon/volume/mounts"
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"
volumemounts "github.com/moby/moby/v2/daemon/volume/mounts"
"github.com/moby/sys/mount"
"github.com/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors"

2
daemon/container/container_windows.go
View File

@@ -6,10 +6,10 @@ import (
"os"
"path/filepath"
"github.com/docker/docker/errdefs"
containertypes "github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/events"
swarmtypes "github.com/moby/moby/api/types/swarm"
"github.com/moby/moby/v2/errdefs"
)
const (

6
daemon/container/exec.go
View File

@@ -7,9 +7,9 @@ import (
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/docker/docker/daemon/internal/libcontainerd/types"
"github.com/docker/docker/daemon/internal/stream"
"github.com/docker/docker/daemon/internal/stringid"
"github.com/moby/moby/v2/daemon/internal/libcontainerd/types"
"github.com/moby/moby/v2/daemon/internal/stream"
"github.com/moby/moby/v2/daemon/internal/stringid"
)
// ExecConfig holds the configurations for execs. The Daemon keeps

2
daemon/container/state.go
View File

@@ -7,9 +7,9 @@ import (
"sync"
"time"
libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"
"github.com/docker/go-units"
"github.com/moby/moby/api/types/container"
libcontainerdtypes "github.com/moby/moby/v2/daemon/internal/libcontainerd/types"
)
// State holds the current container state, and has methods to get and

Some files were not shown because too many files have changed in this diff Show More