vendor: test idtools refactor

Signed-off-by: Sebastiaan van Stijn <[email protected]>
moby · Dec 23, 2024 · 0b19807 · 0b19807
1 parent ca07d2a
commit 0b19807
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 490 deletions.
diff --git a/go.mod b/go.mod
@@ -2,8 +2,8 @@ module github.com/moby/buildkit
 
 go 1.22.0
 
-// FIXME(thaJeztah): testing moby master
-replace github.com/docker/docker => github.com/docker/docker v27.0.2-0.20241223115700-a72026acbbdf+incompatible
+// FIXME(thaJeztah): testing https://github.com/moby/moby/pull/49087 (split-idtools-internal branch)
+replace github.com/docker/docker => github.com/dmcgowan/docker v1.1.3-0.20241223115939-cb7934ca2190
 
 replace github.com/docker/cli => github.com/docker/cli v27.0.2-0.20241218124108-2f67b2f3ff3a+incompatible
 

diff --git a/go.sum b/go.sum
@@ -138,10 +138,10 @@ github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi
 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
+github.com/dmcgowan/docker v1.1.3-0.20241223115939-cb7934ca2190 h1:R75noWP/4Jlxmm2cul3siHPUJIRxeDLB6o6pC2OyqBA=
+github.com/dmcgowan/docker v1.1.3-0.20241223115939-cb7934ca2190/go.mod h1:AKi7Z6FzccBGsB9PP0AbY4O0g9QR4Y5RmrVhRbN4r3Q=
 github.com/docker/cli v27.0.2-0.20241218124108-2f67b2f3ff3a+incompatible h1:XsSN1xr87F/IR/WB7nWhL7qJIb72GLkZKvMSWPYFYrY=
 github.com/docker/cli v27.0.2-0.20241218124108-2f67b2f3ff3a+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/docker v27.0.2-0.20241223115700-a72026acbbdf+incompatible h1:FOlr2DkAdfOdGc3O8YjP27v2XzFGIrYmwtORXMbbxJI=
-github.com/docker/docker v27.0.2-0.20241223115700-a72026acbbdf+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
 github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=

diff --git a/vendor/github.com/docker/docker/pkg/idtools/const_windows.go b/vendor/github.com/docker/docker/pkg/idtools/const_windows.go
diff --git a/vendor/github.com/docker/docker/pkg/idtools/idtools.go b/vendor/github.com/docker/docker/pkg/idtools/idtools.go
diff --git a/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go b/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go
diff --git a/vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go b/vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go