Create github.com/moby/moby/v2 module

Signed-off-by: Derek McGowan <derek@mcg.dev>

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