Skip to content

Commit a5ec623

Browse files
thaJeztahthaJeztah
committed
vendor: update engine to remove uses of pkg/system
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 0c04dc0 commit a5ec623

19 files changed

+11
-415
lines changed

‎.golangci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ linters-settings:
5959
desc: Use github.com/moby/sys/userns instead.
6060
- pkg: "github.com/containerd/containerd/platforms"
6161
desc: The containerd platforms package was migrated to a separate module. Use github.com/containerd/platforms instead.
62+
- pkg: "github.com/docker/docker/pkg/system"
63+
desc: This package should not be used unless strictly necessary.
6264
- pkg: "io/ioutil"
6365
desc: The io/ioutil package has been deprecated, see https://go.dev/doc/go1.16#ioutil
6466
gocyclo:

‎vendor.mod‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ module github.com/docker/cli
66

77
go 1.22.0
88

9+
// FIXME(thaJeztah): testing https://github.com/moby/moby/pull/49162 (pkg_system_volume_uuid branch)
10+
replace github.com/docker/docker => github.com/thaJeztah/docker v24.0.0-rc.1.0.20241221133943-c759fb20d64a+incompatible
11+
912
require (
1013
dario.cat/mergo v1.0.1
1114
github.com/containerd/platforms v0.2.1

‎vendor.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ github.com/docker/cli-docs-tool v0.8.0/go.mod h1:8TQQ3E7mOXoYUs811LiPdUnAhXrcVsB
5151
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
5252
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
5353
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
54-
github.com/docker/docker v27.0.2-0.20241220121230-ad6929339acd+incompatible h1:sQ4Qsqxsm87Q30YfleVm/Sb/Glf9VoQn+5g6Vl5XLXo=
55-
github.com/docker/docker v27.0.2-0.20241220121230-ad6929339acd+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
5654
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
5755
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
5856
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
@@ -264,6 +262,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
264262
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
265263
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
266264
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
265+
github.com/thaJeztah/docker v24.0.0-rc.1.0.20241221133943-c759fb20d64a+incompatible h1:gQVgOLLADpZYw1fU5oL3bf6Ns6F5dY+KilFaecLZFZY=
266+
github.com/thaJeztah/docker v24.0.0-rc.1.0.20241221133943-c759fb20d64a+incompatible/go.mod h1:eZ6Ef2GDr/8h8se23uenzFTrBHwc9jBEEnfrxqOb0Ss=
267267
github.com/theupdateframework/notary v0.7.1-0.20210315103452-bf96a202a09a h1:tlJ7tGUHvcvL1v3yR6NcCc9nOqh2L+CG6HWrYQtwzQ0=
268268
github.com/theupdateframework/notary v0.7.1-0.20210315103452-bf96a202a09a/go.mod h1:Y94A6rPp2OwNfP/7vmf8O2xx2IykP8pPXQ1DLouGnEw=
269269
github.com/tonistiigi/go-rosetta v0.0.0-20220804170347-3f4430f2d346 h1:TvtdmeYsYEij78hS4oxnwikoiLdIrgav3BA+CbhaDAI=

‎vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go‎

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/docker/pkg/system/args_windows.go‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/chtimes.go‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/chtimes_nowindows.go‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/chtimes_windows.go‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/errors.go‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎vendor/github.com/docker/docker/pkg/system/filesys.go‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)