diff --git a/daemon/builder/remotecontext/git/gitutils_test.go b/daemon/builder/remotecontext/git/gitutils_test.go index 642efd950f..f2a925e2ff 100644 --- a/daemon/builder/remotecontext/git/gitutils_test.go +++ b/daemon/builder/remotecontext/git/gitutils_test.go @@ -155,7 +155,7 @@ func TestCloneArgsDumbHttp(t *testing.T) { } func TestCloneArgsGit(t *testing.T) { - args := fetchArgs("git://github.com/docker/docker", "master") + args := fetchArgs("git://github.com/moby/moby", "master") exp := []string{"fetch", "--depth", "1", "origin", "--", "master"} assert.Check(t, is.DeepEqual(exp, args)) } diff --git a/daemon/internal/builder-next/worker/mod/mod_test.go b/daemon/internal/builder-next/worker/mod/mod_test.go index 995b64884b..718b8eb4a3 100644 --- a/daemon/internal/builder-next/worker/mod/mod_test.go +++ b/daemon/internal/builder-next/worker/mod/mod_test.go @@ -16,8 +16,8 @@ func TestModuleVersion(t *testing.T) { name: "returns empty string if build information not available", biContent: ` go go1.20.3 -path github.com/docker/docker/builder/builder-next/worker -mod github.com/docker/docker (devel) +path github.com/moby/moby/v2/daemon/internal/builder-next/worker +mod github.com/moby/moby/v2 (devel) `, module: "github.com/moby/buildkit", wantVersion: "", @@ -26,8 +26,8 @@ mod github.com/docker/docker (devel) name: "returns the version of buildkit dependency", biContent: ` go go1.20.3 -path github.com/docker/docker/builder/builder-next/worker -mod github.com/docker/docker (devel) +path github.com/moby/moby/v2/daemon/internal/builder-next/worker +mod github.com/moby/moby/v2 (devel) dep github.com/moby/buildkit v0.11.5 h1:JZvvWzulcnA2G4c/gJiSIqKDUoBjctYw2WMuS+XJexU= `, module: "github.com/moby/buildkit", @@ -37,8 +37,8 @@ dep github.com/moby/buildkit v0.11.5 h1:JZvvWzulcnA2G4c/gJiSIqKDUoBjctYw2WMuS+XJ name: "returns the replaced version of buildkit dependency", biContent: ` go go1.20.3 -path github.com/docker/docker/builder/builder-next/worker -mod github.com/docker/docker (devel) +path github.com/moby/moby/v2/daemon/internal/builder-next/worker +mod github.com/moby/moby/v2 (devel) dep github.com/moby/buildkit v0.11.5 h1:JZvvWzulcnA2G4c/gJiSIqKDUoBjctYw2WMuS+XJexU= => github.com/moby/buildkit v0.12.0 h1:3YO8J4RtmG7elEgaWMb4HgmpS2CfY1QlaOz9nwB+ZSs= `, @@ -49,8 +49,8 @@ dep github.com/moby/buildkit v0.11.5 h1:JZvvWzulcnA2G4c/gJiSIqKDUoBjctYw2WMuS+XJ name: "returns the base version of pseudo version", biContent: ` go go1.20.3 -path github.com/docker/docker/builder/builder-next/worker -mod github.com/docker/docker (devel) +path github.com/moby/moby/v2/daemon/internal/builder-next/worker +mod github.com/moby/moby/v2 (devel) dep github.com/moby/buildkit v0.10.7-0.20230306143919-70f2ad56d3e5 h1:JZvvWzulcnA2G4c/gJiSIqKDUoBjctYw2WMuS+XJexU= `, module: "github.com/moby/buildkit", diff --git a/testutil/fakestorage/fixtures.go b/testutil/fakestorage/fixtures.go index 2d718de5d6..64e37cde43 100644 --- a/testutil/fakestorage/fixtures.go +++ b/testutil/fakestorage/fixtures.go @@ -51,7 +51,7 @@ func ensureHTTPServerImage(t testing.TB) { t.Fatalf("could not build http server: %v", lookErr) } - cmd := exec.Command(goCmd, "build", "-o", filepath.Join(tmp, "httpserver"), "github.com/docker/docker/contrib/httpserver") + cmd := exec.Command(goCmd, "build", "-o", filepath.Join(tmp, "httpserver"), "github.com/moby/moby/v2/contrib/httpserver") cmd.Env = append(os.Environ(), []string{ "CGO_ENABLED=0", "GOOS=" + goos,